X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffunctional_test_utils.rs;h=554e60ba7379117c6b1842f01416fbca11bc7718;hb=e94e403dda57e1443fdeda9f1d0b2cb8a9e7fb0f;hp=d8c1b75fad206cd1a144c06131bb9197c860fb9e;hpb=fa1a0d8531612d16cedc9c1bdcea3e3989649c7c;p=rust-lightning

diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index d8c1b75f..554e60ba 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -901,60 +901,10 @@ pub fn create_unannounced_chan_between_nodes_with_value<'a, 'b, 'c, 'd>(nodes: &
 }
 
 pub fn update_nodes_with_chan_announce<'a, 'b, 'c, 'd>(nodes: &'a Vec<Node<'b, 'c, 'd>>, a: usize, b: usize, ann: &msgs::ChannelAnnouncement, upd_1: &msgs::ChannelUpdate, upd_2: &msgs::ChannelUpdate) {
-	nodes[a].node.broadcast_node_announcement([0, 0, 0], [0; 32], Vec::new());
-	let a_events = nodes[a].node.get_and_clear_pending_msg_events();
-	assert!(a_events.len() >= 2);
-
-	// ann should be re-generated by broadcast_node_announcement - check that we have it.
-	let mut found_ann_1 = false;
-	for event in a_events.iter() {
-		match event {
-			MessageSendEvent::BroadcastChannelAnnouncement { ref msg, .. } => {
-				if msg == ann { found_ann_1 = true; }
-			},
-			MessageSendEvent::BroadcastNodeAnnouncement { .. } => {},
-			_ => panic!("Unexpected event {:?}", event),
-		}
-	}
-	assert!(found_ann_1);
-
-	let a_node_announcement = match a_events.last().unwrap() {
-		MessageSendEvent::BroadcastNodeAnnouncement { ref msg } => {
-			(*msg).clone()
-		},
-		_ => panic!("Unexpected event"),
-	};
-
-	nodes[b].node.broadcast_node_announcement([1, 1, 1], [1; 32], Vec::new());
-	let b_events = nodes[b].node.get_and_clear_pending_msg_events();
-	assert!(b_events.len() >= 2);
-
-	// ann should be re-generated by broadcast_node_announcement - check that we have it.
-	let mut found_ann_2 = false;
-	for event in b_events.iter() {
-		match event {
-			MessageSendEvent::BroadcastChannelAnnouncement { ref msg, .. } => {
-				if msg == ann { found_ann_2 = true; }
-			},
-			MessageSendEvent::BroadcastNodeAnnouncement { .. } => {},
-			_ => panic!("Unexpected event"),
-		}
-	}
-	assert!(found_ann_2);
-
-	let b_node_announcement = match b_events.last().unwrap() {
-		MessageSendEvent::BroadcastNodeAnnouncement { ref msg } => {
-			(*msg).clone()
-		},
-		_ => panic!("Unexpected event"),
-	};
-
 	for node in nodes {
 		assert!(node.gossip_sync.handle_channel_announcement(ann).unwrap());
 		node.gossip_sync.handle_channel_update(upd_1).unwrap();
 		node.gossip_sync.handle_channel_update(upd_2).unwrap();
-		node.gossip_sync.handle_node_announcement(&a_node_announcement).unwrap();
-		node.gossip_sync.handle_node_announcement(&b_node_announcement).unwrap();
 
 		// Note that channel_updates are also delivered to ChannelManagers to ensure we have
 		// forwarding info for local channels even if its not accepted in the network graph.
@@ -2333,15 +2283,27 @@ macro_rules! get_channel_value_stat {
 macro_rules! get_chan_reestablish_msgs {
 	($src_node: expr, $dst_node: expr) => {
 		{
+			let mut announcements = $crate::prelude::HashSet::new();
 			let mut res = Vec::with_capacity(1);
 			for msg in $src_node.node.get_and_clear_pending_msg_events() {
 				if let MessageSendEvent::SendChannelReestablish { ref node_id, ref msg } = msg {
 					assert_eq!(*node_id, $dst_node.node.get_our_node_id());
 					res.push(msg.clone());
+				} else if let MessageSendEvent::SendChannelAnnouncement { ref node_id, ref msg, .. } = msg {
+					assert_eq!(*node_id, $dst_node.node.get_our_node_id());
+					announcements.insert(msg.contents.short_channel_id);
 				} else {
 					panic!("Unexpected event")
 				}
 			}
+			for chan in $src_node.node.list_channels() {
+				if chan.is_public && chan.counterparty.node_id != $dst_node.node.get_our_node_id() {
+					if let Some(scid) = chan.short_channel_id {
+						assert!(announcements.remove(&scid));
+					}
+				}
+			}
+			assert!(announcements.is_empty());
 			res
 		}
 	}