X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Ftest_utils.rs;h=f4048f58d4dc9ef5478b43b9922c8082754938c4;hb=1f399b0984d591019320459d804cbad859c608ae;hp=b737bab352441a1b2a9289cc143e078ba6384c97;hpb=41a6c674f9c06c89b0890364ac75b57b648e538e;p=rust-lightning

diff --git a/lightning/src/routing/test_utils.rs b/lightning/src/routing/test_utils.rs
index b737bab3..f4048f58 100644
--- a/lightning/src/routing/test_utils.rs
+++ b/lightning/src/routing/test_utils.rs
@@ -7,17 +7,17 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
-use crate::routing::gossip::{NetworkGraph, P2PGossipSync};
+use crate::routing::gossip::{NetworkGraph, NodeAlias, P2PGossipSync};
 use crate::ln::features::{ChannelFeatures, NodeFeatures};
 use crate::ln::msgs::{UnsignedChannelAnnouncement, ChannelAnnouncement, RoutingMessageHandler,
 	NodeAnnouncement, UnsignedNodeAnnouncement, ChannelUpdate, UnsignedChannelUpdate, MAX_VALUE_MSAT};
 use crate::util::test_utils;
 use crate::util::ser::Writeable;
 
+use bitcoin::blockdata::constants::ChainHash;
 use bitcoin::hashes::sha256d::Hash as Sha256dHash;
 use bitcoin::hashes::Hash;
 use bitcoin::network::constants::Network;
-use bitcoin::blockdata::constants::genesis_block;
 
 use hex;
 
@@ -39,7 +39,7 @@ pub(super) fn add_channel(
 
 	let unsigned_announcement = UnsignedChannelAnnouncement {
 		features,
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id,
 		node_id_1,
 		node_id_2,
@@ -72,7 +72,7 @@ pub(super) fn add_or_update_node(
 		timestamp,
 		node_id,
 		rgb: [0; 3],
-		alias: [0; 32],
+		alias: NodeAlias([0; 32]),
 		addresses: Vec::new(),
 		excess_address_data: Vec::new(),
 		excess_data: Vec::new(),
@@ -141,8 +141,7 @@ pub(super) fn build_line_graph() -> (
 	let secp_ctx = Secp256k1::new();
 	let logger = Arc::new(test_utils::TestLogger::new());
 	let chain_monitor = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
-	let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
-	let network_graph = Arc::new(NetworkGraph::new(genesis_hash, Arc::clone(&logger)));
+	let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, Arc::clone(&logger)));
 	let gossip_sync = P2PGossipSync::new(Arc::clone(&network_graph), None, Arc::clone(&logger));
 
 	// Build network from our_id to node 19:
@@ -155,7 +154,7 @@ pub(super) fn build_line_graph() -> (
 			add_channel(&gossip_sync, &secp_ctx, &cur_privkey, &next_privkey,
 				ChannelFeatures::from_le_bytes(id_to_feature_flags(1)), cur_short_channel_id);
 			update_channel(&gossip_sync, &secp_ctx, &cur_privkey, UnsignedChannelUpdate {
-				chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+				chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 				short_channel_id: cur_short_channel_id,
 				timestamp: idx as u32,
 				flags: 0,
@@ -167,7 +166,7 @@ pub(super) fn build_line_graph() -> (
 				excess_data: Vec::new()
 			});
 			update_channel(&gossip_sync, &secp_ctx, &next_privkey, UnsignedChannelUpdate {
-				chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+				chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 				short_channel_id: cur_short_channel_id,
 				timestamp: (idx as u32)+1,
 				flags: 1,
@@ -195,8 +194,7 @@ pub(super) fn build_graph() -> (
 	let secp_ctx = Secp256k1::new();
 	let logger = Arc::new(test_utils::TestLogger::new());
 	let chain_monitor = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
-	let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
-	let network_graph = Arc::new(NetworkGraph::new(genesis_hash, Arc::clone(&logger)));
+	let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, Arc::clone(&logger)));
 	let gossip_sync = P2PGossipSync::new(Arc::clone(&network_graph), None, Arc::clone(&logger));
 	// Build network from our_id to node6:
 	//
@@ -261,7 +259,7 @@ pub(super) fn build_graph() -> (
 
 	add_channel(&gossip_sync, &secp_ctx, &our_privkey, &privkeys[0], ChannelFeatures::from_le_bytes(id_to_feature_flags(1)), 1);
 	update_channel(&gossip_sync, &secp_ctx, &privkeys[0], UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 1,
 		timestamp: 1,
 		flags: 1,
@@ -277,7 +275,7 @@ pub(super) fn build_graph() -> (
 
 	add_channel(&gossip_sync, &secp_ctx, &our_privkey, &privkeys[1], ChannelFeatures::from_le_bytes(id_to_feature_flags(2)), 2);
 	update_channel(&gossip_sync, &secp_ctx, &our_privkey, UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 2,
 		timestamp: 1,
 		flags: 0,
@@ -289,7 +287,7 @@ pub(super) fn build_graph() -> (
 		excess_data: Vec::new()
 	});
 	update_channel(&gossip_sync, &secp_ctx, &privkeys[1], UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 2,
 		timestamp: 1,
 		flags: 1,
@@ -305,7 +303,7 @@ pub(super) fn build_graph() -> (
 
 	add_channel(&gossip_sync, &secp_ctx, &our_privkey, &privkeys[7], ChannelFeatures::from_le_bytes(id_to_feature_flags(12)), 12);
 	update_channel(&gossip_sync, &secp_ctx, &our_privkey, UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 12,
 		timestamp: 1,
 		flags: 0,
@@ -317,7 +315,7 @@ pub(super) fn build_graph() -> (
 		excess_data: Vec::new()
 	});
 	update_channel(&gossip_sync, &secp_ctx, &privkeys[7], UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 12,
 		timestamp: 1,
 		flags: 1,
@@ -333,7 +331,7 @@ pub(super) fn build_graph() -> (
 
 	add_channel(&gossip_sync, &secp_ctx, &privkeys[0], &privkeys[2], ChannelFeatures::from_le_bytes(id_to_feature_flags(3)), 3);
 	update_channel(&gossip_sync, &secp_ctx, &privkeys[0], UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 3,
 		timestamp: 1,
 		flags: 0,
@@ -345,7 +343,7 @@ pub(super) fn build_graph() -> (
 		excess_data: Vec::new()
 	});
 	update_channel(&gossip_sync, &secp_ctx, &privkeys[2], UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 3,
 		timestamp: 1,
 		flags: 1,
@@ -359,7 +357,7 @@ pub(super) fn build_graph() -> (
 
 	add_channel(&gossip_sync, &secp_ctx, &privkeys[1], &privkeys[2], ChannelFeatures::from_le_bytes(id_to_feature_flags(4)), 4);
 	update_channel(&gossip_sync, &secp_ctx, &privkeys[1], UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 4,
 		timestamp: 1,
 		flags: 0,
@@ -371,7 +369,7 @@ pub(super) fn build_graph() -> (
 		excess_data: Vec::new()
 	});
 	update_channel(&gossip_sync, &secp_ctx, &privkeys[2], UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 4,
 		timestamp: 1,
 		flags: 1,
@@ -385,7 +383,7 @@ pub(super) fn build_graph() -> (
 
 	add_channel(&gossip_sync, &secp_ctx, &privkeys[7], &privkeys[2], ChannelFeatures::from_le_bytes(id_to_feature_flags(13)), 13);
 	update_channel(&gossip_sync, &secp_ctx, &privkeys[7], UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 13,
 		timestamp: 1,
 		flags: 0,
@@ -397,7 +395,7 @@ pub(super) fn build_graph() -> (
 		excess_data: Vec::new()
 	});
 	update_channel(&gossip_sync, &secp_ctx, &privkeys[2], UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 13,
 		timestamp: 1,
 		flags: 1,
@@ -413,7 +411,7 @@ pub(super) fn build_graph() -> (
 
 	add_channel(&gossip_sync, &secp_ctx, &privkeys[2], &privkeys[4], ChannelFeatures::from_le_bytes(id_to_feature_flags(6)), 6);
 	update_channel(&gossip_sync, &secp_ctx, &privkeys[2], UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 6,
 		timestamp: 1,
 		flags: 0,
@@ -425,7 +423,7 @@ pub(super) fn build_graph() -> (
 		excess_data: Vec::new()
 	});
 	update_channel(&gossip_sync, &secp_ctx, &privkeys[4], UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 6,
 		timestamp: 1,
 		flags: 1,
@@ -439,7 +437,7 @@ pub(super) fn build_graph() -> (
 
 	add_channel(&gossip_sync, &secp_ctx, &privkeys[4], &privkeys[3], ChannelFeatures::from_le_bytes(id_to_feature_flags(11)), 11);
 	update_channel(&gossip_sync, &secp_ctx, &privkeys[4], UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 11,
 		timestamp: 1,
 		flags: 0,
@@ -451,7 +449,7 @@ pub(super) fn build_graph() -> (
 		excess_data: Vec::new()
 	});
 	update_channel(&gossip_sync, &secp_ctx, &privkeys[3], UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 11,
 		timestamp: 1,
 		flags: 1,
@@ -469,7 +467,7 @@ pub(super) fn build_graph() -> (
 
 	add_channel(&gossip_sync, &secp_ctx, &privkeys[2], &privkeys[5], ChannelFeatures::from_le_bytes(id_to_feature_flags(7)), 7);
 	update_channel(&gossip_sync, &secp_ctx, &privkeys[2], UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 7,
 		timestamp: 1,
 		flags: 0,
@@ -481,7 +479,7 @@ pub(super) fn build_graph() -> (
 		excess_data: Vec::new()
 	});
 	update_channel(&gossip_sync, &secp_ctx, &privkeys[5], UnsignedChannelUpdate {
-		chain_hash: genesis_block(Network::Testnet).header.block_hash(),
+		chain_hash: ChainHash::using_genesis_block(Network::Testnet),
 		short_channel_id: 7,
 		timestamp: 1,
 		flags: 1,