X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fshutdown_tests.rs;h=f59ae6692f5187b7ef0a173fb5524cb113f6d859;hb=0a7a5f9538cbca512c653ec5d6c1625f0b9a955a;hp=0eb56434169bec971cdf9853cb3245a1916190d5;hpb=a634fd1dad468e4af51b508b3a0245f9655d129e;p=rust-lightning

diff --git a/lightning/src/ln/shutdown_tests.rs b/lightning/src/ln/shutdown_tests.rs
index 0eb56434..f59ae669 100644
--- a/lightning/src/ln/shutdown_tests.rs
+++ b/lightning/src/ln/shutdown_tests.rs
@@ -275,7 +275,7 @@ fn shutdown_on_unfunded_channel() {
 		.into_script();
 
 	nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &msgs::Shutdown {
-		channel_id: open_chan.temporary_channel_id, scriptpubkey: script,
+		channel_id: open_chan.common_fields.temporary_channel_id, scriptpubkey: script,
 	});
 	check_closed_event!(nodes[0], 1, ClosureReason::CounterpartyCoopClosedUnfundedChannel, [nodes[1].node.get_our_node_id()], 1_000_000);
 }
@@ -813,7 +813,7 @@ fn test_unsupported_anysegwit_upfront_shutdown_script() {
 	// Check script when handling an open_channel message
 	nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100000, 10001, 42, None, None).unwrap();
 	let mut open_channel = get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id());
-	open_channel.shutdown_scriptpubkey = Some(anysegwit_shutdown_script.clone());
+	open_channel.common_fields.shutdown_scriptpubkey = Some(anysegwit_shutdown_script.clone());
 	nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), &open_channel);
 
 	let events = nodes[1].node.get_and_clear_pending_msg_events();
@@ -838,7 +838,7 @@ fn test_unsupported_anysegwit_upfront_shutdown_script() {
 	let open_channel = get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id());
 	nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), &open_channel);
 	let mut accept_channel = get_event_msg!(nodes[1], MessageSendEvent::SendAcceptChannel, nodes[0].node.get_our_node_id());
-	accept_channel.shutdown_scriptpubkey = Some(anysegwit_shutdown_script.clone());
+	accept_channel.common_fields.shutdown_scriptpubkey = Some(anysegwit_shutdown_script.clone());
 	nodes[0].node.handle_accept_channel(&nodes[1].node.get_our_node_id(), &accept_channel);
 
 	let events = nodes[0].node.get_and_clear_pending_msg_events();
@@ -865,7 +865,7 @@ fn test_invalid_upfront_shutdown_script() {
 
 	// Use a segwit v0 script with an unsupported witness program
 	let mut open_channel = get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id());
-	open_channel.shutdown_scriptpubkey = Some(Builder::new().push_int(0)
+	open_channel.common_fields.shutdown_scriptpubkey = Some(Builder::new().push_int(0)
 		.push_slice(&[0, 0])
 		.into_script());
 	nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), &open_channel);