X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Fnetwork_graph.rs;h=39c2894b32c429b5115f4eee66c427bed21989b1;hb=72e9f53be7b9b44ce8fb1a817a3af6a98db79755;hp=5268d443771cf48d668c1dee6e3a05c14e1c6b39;hpb=1386a0c96b96b119dd9690ea72f4e3cce05cb5cb;p=rust-lightning

diff --git a/lightning/src/routing/network_graph.rs b/lightning/src/routing/network_graph.rs
index 5268d443..39c2894b 100644
--- a/lightning/src/routing/network_graph.rs
+++ b/lightning/src/routing/network_graph.rs
@@ -1033,6 +1033,15 @@ impl NetworkGraph {
 		}
 	}
 
+	/// Clears the `NodeAnnouncementInfo` field for all nodes in the `NetworkGraph` for testing
+	/// purposes.
+	#[cfg(test)]
+	pub fn clear_nodes_announcement_info(&self) {
+		for node in self.nodes.write().unwrap().iter_mut() {
+			node.1.announcement_info = None;
+		}
+	}
+
 	/// For an already known node (from channel announcements), update its stored properties from a
 	/// given node announcement.
 	///
@@ -1385,8 +1394,8 @@ impl NetworkGraph {
 						}
 					}
 				}
-				macro_rules! maybe_update_channel_info {
-					( $target: expr, $src_node: expr) => {
+				macro_rules! check_update_latest {
+					($target: expr) => {
 						if let Some(existing_chan_info) = $target.as_ref() {
 							// The timestamp field is somewhat of a misnomer - the BOLTs use it to
 							// order updates to ensure you always have the latest one, only
@@ -1403,7 +1412,11 @@ impl NetworkGraph {
 						} else {
 							chan_was_enabled = false;
 						}
+					}
+				}
 
+				macro_rules! get_new_channel_info {
+					() => { {
 						let last_update_message = if msg.excess_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY
 							{ full_msg.cloned() } else { None };
 
@@ -1419,29 +1432,31 @@ impl NetworkGraph {
 							},
 							last_update_message
 						};
-						$target = Some(updated_channel_update_info);
-					}
+						Some(updated_channel_update_info)
+					} }
 				}
 
 				let msg_hash = hash_to_message!(&Sha256dHash::hash(&msg.encode()[..])[..]);
 				if msg.flags & 1 == 1 {
 					dest_node_id = channel.node_one.clone();
+					check_update_latest!(channel.two_to_one);
 					if let Some((sig, ctx)) = sig_info {
 						secp_verify_sig!(ctx, &msg_hash, &sig, &PublicKey::from_slice(channel.node_two.as_slice()).map_err(|_| LightningError{
 							err: "Couldn't parse source node pubkey".to_owned(),
 							action: ErrorAction::IgnoreAndLog(Level::Debug)
 						})?, "channel_update");
 					}
-					maybe_update_channel_info!(channel.two_to_one, channel.node_two);
+					channel.two_to_one = get_new_channel_info!();
 				} else {
 					dest_node_id = channel.node_two.clone();
+					check_update_latest!(channel.one_to_two);
 					if let Some((sig, ctx)) = sig_info {
 						secp_verify_sig!(ctx, &msg_hash, &sig, &PublicKey::from_slice(channel.node_one.as_slice()).map_err(|_| LightningError{
 							err: "Couldn't parse destination node pubkey".to_owned(),
 							action: ErrorAction::IgnoreAndLog(Level::Debug)
 						})?, "channel_update");
 					}
-					maybe_update_channel_info!(channel.one_to_two, channel.node_one);
+					channel.one_to_two = get_new_channel_info!();
 				}
 			}
 		}