X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fpriv_short_conf_tests.rs;h=adc2b59abbf4b3180ab6650e5433305b1fb112ef;hb=73e2fdf332ed095e641625311d2851f6ecbc0691;hp=a6fd7c1dc097e302f62f37175c385e0443bcf2a7;hpb=2a72f4f98caddd38058e520dd522685a19bd4053;p=rust-lightning

diff --git a/lightning/src/ln/priv_short_conf_tests.rs b/lightning/src/ln/priv_short_conf_tests.rs
index a6fd7c1d..adc2b59a 100644
--- a/lightning/src/ln/priv_short_conf_tests.rs
+++ b/lightning/src/ln/priv_short_conf_tests.rs
@@ -184,14 +184,14 @@ fn do_test_1_conf_open(connect_style: ConnectStyle) {
 		msg.clone()
 	} else { panic!("Unexpected event"); };
 	let (bs_announcement, bs_update) = if let MessageSendEvent::BroadcastChannelAnnouncement { ref msg, ref update_msg } = bs_announce_events[1] {
-		(msg.clone(), update_msg.clone())
+		(msg.clone(), update_msg.clone().unwrap())
 	} else { panic!("Unexpected event"); };
 
 	nodes[0].node.handle_announcement_signatures(&nodes[1].node.get_our_node_id(), &bs_announcement_sigs);
 	let as_announce_events = nodes[0].node.get_and_clear_pending_msg_events();
 	assert_eq!(as_announce_events.len(), 1);
 	let (announcement, as_update) = if let MessageSendEvent::BroadcastChannelAnnouncement { ref msg, ref update_msg } = as_announce_events[0] {
-		(msg.clone(), update_msg.clone())
+		(msg.clone(), update_msg.clone().unwrap())
 	} else { panic!("Unexpected event"); };
 	assert_eq!(announcement, bs_announcement);
 
@@ -757,7 +757,7 @@ fn test_public_0conf_channel() {
 	match bs_announcement[0] {
 		MessageSendEvent::BroadcastChannelAnnouncement { ref msg, ref update_msg } => {
 			announcement = msg.clone();
-			bs_update = update_msg.clone();
+			bs_update = update_msg.clone().unwrap();
 		},
 		_ => panic!("Unexpected event"),
 	};
@@ -767,6 +767,7 @@ fn test_public_0conf_channel() {
 	match as_announcement[0] {
 		MessageSendEvent::BroadcastChannelAnnouncement { ref msg, ref update_msg } => {
 			assert!(announcement == *msg);
+			let update_msg = update_msg.as_ref().unwrap();
 			assert_eq!(update_msg.contents.short_channel_id, scid);
 			assert_eq!(update_msg.contents.short_channel_id, announcement.contents.short_channel_id);
 			assert_eq!(update_msg.contents.short_channel_id, bs_update.contents.short_channel_id);