X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Frouter.rs;h=e9b5eb29a43e096eaab1f30f5a28c8f0818642c2;hb=c59468a88996cbb663a2487b77066a48db87e3b2;hp=666c859ee0c57e75ff51e16485234398048d6098;hpb=fce5c1571165afd8e568bdb50632853cae258275;p=rust-lightning

diff --git a/lightning/src/ln/router.rs b/lightning/src/ln/router.rs
index 666c859e..e9b5eb29 100644
--- a/lightning/src/ln/router.rs
+++ b/lightning/src/ln/router.rs
@@ -559,6 +559,7 @@ impl RoutingMessageHandler for Router {
 		add_channel_to_node!(msg.contents.node_id_1);
 		add_channel_to_node!(msg.contents.node_id_2);
 
+		log_trace!(self, "Added channel_announcement for {}{}", msg.contents.short_channel_id, if !should_relay { " with excess uninterpreted data!" } else { "" });
 		Ok(should_relay)
 	}
 
@@ -663,19 +664,16 @@ impl RoutingMessageHandler for Router {
 		Ok(msg.contents.excess_data.is_empty())
 	}
 
-
-	fn get_next_channel_announcements(&self, starting_point: u64, batch_amount: u8) -> Vec<(msgs::ChannelAnnouncement, msgs::ChannelUpdate,msgs::ChannelUpdate)> {
+	fn get_next_channel_announcements(&self, starting_point: u64, batch_amount: u8) -> Vec<(msgs::ChannelAnnouncement, Option<msgs::ChannelUpdate>, Option<msgs::ChannelUpdate>)> {
 		let mut result = Vec::with_capacity(batch_amount as usize);
 		let network = self.network_map.read().unwrap();
 		let mut iter = network.channels.range(starting_point..);
 		while result.len() < batch_amount as usize {
 			if let Some((_, ref chan)) = iter.next() {
-				if chan.announcement_message.is_some() &&
-						chan.one_to_two.last_update_message.is_some() &&
-						chan.two_to_one.last_update_message.is_some() {
+				if chan.announcement_message.is_some() {
 					result.push((chan.announcement_message.clone().unwrap(),
-						chan.one_to_two.last_update_message.clone().unwrap(),
-						chan.two_to_one.last_update_message.clone().unwrap()));
+						chan.one_to_two.last_update_message.clone(),
+						chan.two_to_one.last_update_message.clone()));
 				} else {
 					// TODO: We may end up sending un-announced channel_updates if we are sending
 					// initial sync data while receiving announce/updates for this channel.