X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Fnetwork_graph.rs;h=1a4a8c1a637e7a1e0c0df8a0294f0750265f40b8;hb=343aacc50c73e18ddb1ec52570c5050bdccd09ca;hp=c46781d11b5888b8e0f55114a525db4ea0908a75;hpb=3defcc896266f3d67848ce28981a756e971a3f0c;p=rust-lightning

diff --git a/lightning/src/routing/network_graph.rs b/lightning/src/routing/network_graph.rs
index c46781d1..1a4a8c1a 100644
--- a/lightning/src/routing/network_graph.rs
+++ b/lightning/src/routing/network_graph.rs
@@ -260,7 +260,7 @@ pub struct DirectionalChannelInfo {
 	/// Mostly redundant with the data we store in fields explicitly.
 	/// Everything else is useful only for sending out for initial routing sync.
 	/// Not stored if contains excess data to prevent DoS.
-	pub last_update_message: Option<msgs::ChannelUpdate>,
+	pub last_update_message: Option<ChannelUpdate>,
 }
 
 impl fmt::Display for DirectionalChannelInfo {
@@ -300,7 +300,7 @@ pub struct ChannelInfo {
 	/// Mostly redundant with the data we store in fields explicitly.
 	/// Everything else is useful only for sending out for initial routing sync.
 	/// Not stored if contains excess data to prevent DoS.
-	pub announcement_message: Option<msgs::ChannelAnnouncement>,
+	pub announcement_message: Option<ChannelAnnouncement>,
 }
 
 impl fmt::Display for ChannelInfo {
@@ -371,7 +371,7 @@ pub struct NodeAnnouncementInfo {
 	/// Mostly redundant with the data we store in fields explicitly.
 	/// Everything else is useful only for sending out for initial routing sync.
 	/// Not stored if contains excess data to prevent DoS.
-	pub announcement_message: Option<msgs::NodeAnnouncement>
+	pub announcement_message: Option<NodeAnnouncement>
 }
 
 impl Writeable for NodeAnnouncementInfo {
@@ -526,13 +526,19 @@ impl fmt::Display for NetworkGraph {
 
 impl NetworkGraph {
 	/// Returns all known valid channels' short ids along with announced channel info.
+	///
+	/// (C-not exported) because we have no mapping for `BTreeMap`s
 	pub fn get_channels<'a>(&'a self) -> &'a BTreeMap<u64, ChannelInfo> { &self.channels }
 	/// Returns all known nodes' public keys along with announced node info.
+	///
+	/// (C-not exported) because we have no mapping for `BTreeMap`s
 	pub fn get_nodes<'a>(&'a self) -> &'a BTreeMap<PublicKey, NodeInfo> { &self.nodes }
 
 	/// Get network addresses by node id.
 	/// Returns None if the requested node is completely unknown,
 	/// or if node announcement for the node was never received.
+	///
+	/// (C-not exported) as there is no practical way to track lifetimes of returned values.
 	pub fn get_addresses<'a>(&'a self, pubkey: &PublicKey) -> Option<&'a Vec<NetAddress>> {
 		if let Some(node) = self.nodes.get(pubkey) {
 			if let Some(node_info) = node.announcement_info.as_ref() {
@@ -838,7 +844,6 @@ mod tests {
 	use bitcoin::blockdata::constants::genesis_block;
 	use bitcoin::blockdata::script::Builder;
 	use bitcoin::blockdata::opcodes;
-	use bitcoin::util::hash::BitcoinHash;
 
 	use hex;
 
@@ -906,7 +911,7 @@ mod tests {
 			// Announce a channel to add a corresponding node.
 			let unsigned_announcement = UnsignedChannelAnnouncement {
 				features: ChannelFeatures::known(),
-				chain_hash: genesis_block(Network::Testnet).header.bitcoin_hash(),
+				chain_hash: genesis_block(Network::Testnet).header.block_hash(),
 				short_channel_id: 0,
 				node_id_1,
 				node_id_2,
@@ -996,7 +1001,7 @@ mod tests {
 
 		let mut unsigned_announcement = UnsignedChannelAnnouncement {
 			features: ChannelFeatures::known(),
-			chain_hash: genesis_block(Network::Testnet).header.bitcoin_hash(),
+			chain_hash: genesis_block(Network::Testnet).header.block_hash(),
 			short_channel_id: 0,
 			node_id_1,
 			node_id_2,
@@ -1176,7 +1181,7 @@ mod tests {
 
 		let zero_hash = Sha256dHash::hash(&[0; 32]);
 		let short_channel_id = 0;
-		let chain_hash = genesis_block(Network::Testnet).header.bitcoin_hash();
+		let chain_hash = genesis_block(Network::Testnet).header.block_hash();
 		let amount_sats = 1000_000;
 
 		{
@@ -1339,7 +1344,7 @@ mod tests {
 		let node_2_btckey = &SecretKey::from_slice(&[39; 32]).unwrap();
 
 		let short_channel_id = 0;
-		let chain_hash = genesis_block(Network::Testnet).header.bitcoin_hash();
+		let chain_hash = genesis_block(Network::Testnet).header.block_hash();
 
 		{
 			// There is no nodes in the table at the beginning.
@@ -1454,7 +1459,7 @@ mod tests {
 		let node_2_btckey = &SecretKey::from_slice(&[39; 32]).unwrap();
 
 		let short_channel_id = 1;
-		let chain_hash = genesis_block(Network::Testnet).header.bitcoin_hash();
+		let chain_hash = genesis_block(Network::Testnet).header.block_hash();
 
 		// Channels were not announced yet.
 		let channels_with_announcements = net_graph_msg_handler.get_next_channel_announcements(0, 1);
@@ -1588,7 +1593,7 @@ mod tests {
 		let node_2_btckey = &SecretKey::from_slice(&[39; 32]).unwrap();
 
 		let short_channel_id = 1;
-		let chain_hash = genesis_block(Network::Testnet).header.bitcoin_hash();
+		let chain_hash = genesis_block(Network::Testnet).header.block_hash();
 
 		// No nodes yet.
 		let next_announcements = net_graph_msg_handler.get_next_node_announcements(None, 10);
@@ -1708,7 +1713,7 @@ mod tests {
 		let node_id_2 = PublicKey::from_secret_key(&secp_ctx, node_2_privkey);
 		let unsigned_announcement = UnsignedChannelAnnouncement {
 			features: ChannelFeatures::known(),
-			chain_hash: genesis_block(Network::Testnet).header.bitcoin_hash(),
+			chain_hash: genesis_block(Network::Testnet).header.block_hash(),
 			short_channel_id: 0,
 			node_id_1,
 			node_id_2,