X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Ftest_utils.rs;h=d0e44eb214cf4fe3d43a5a8c52b6b6e340a9f2b9;hb=a8eef297fceacc0ca984c28cd5114b1ec08d8b7e;hp=f1a853f0a3e0930aace913782d187353d63e76fe;hpb=2fda791d5c36863ca69b290c9293db2fe0d35a25;p=rust-lightning

diff --git a/lightning/src/routing/test_utils.rs b/lightning/src/routing/test_utils.rs
index f1a853f0..d0e44eb2 100644
--- a/lightning/src/routing/test_utils.rs
+++ b/lightning/src/routing/test_utils.rs
@@ -7,12 +7,12 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
-use routing::gossip::{NetworkGraph, P2PGossipSync};
-use ln::features::{ChannelFeatures, NodeFeatures};
-use ln::msgs::{UnsignedChannelAnnouncement, ChannelAnnouncement, RoutingMessageHandler,
+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 util::test_utils;
-use util::ser::Writeable;
+use crate::util::test_utils;
+use crate::util::ser::Writeable;
 
 use bitcoin::hashes::sha256d::Hash as Sha256dHash;
 use bitcoin::hashes::Hash;
@@ -24,16 +24,18 @@ use hex;
 use bitcoin::secp256k1::{PublicKey,SecretKey};
 use bitcoin::secp256k1::{Secp256k1, All};
 
-use prelude::*;
-use sync::{self, Arc};
+use crate::prelude::*;
+use crate::sync::{self, Arc};
+
+use crate::routing::gossip::NodeId;
 
 // Using the same keys for LN and BTC ids
 pub(super) fn add_channel(
 	gossip_sync: &P2PGossipSync<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestChainSource>, Arc<test_utils::TestLogger>>,
 	secp_ctx: &Secp256k1<All>, node_1_privkey: &SecretKey, node_2_privkey: &SecretKey, features: ChannelFeatures, short_channel_id: u64
 ) {
-	let node_id_1 = PublicKey::from_secret_key(&secp_ctx, node_1_privkey);
-	let node_id_2 = PublicKey::from_secret_key(&secp_ctx, node_2_privkey);
+	let node_id_1 = NodeId::from_pubkey(&PublicKey::from_secret_key(&secp_ctx, node_1_privkey));
+	let node_id_2 = NodeId::from_pubkey(&PublicKey::from_secret_key(&secp_ctx, node_2_privkey));
 
 	let unsigned_announcement = UnsignedChannelAnnouncement {
 		features,
@@ -64,13 +66,13 @@ pub(super) fn add_or_update_node(
 	gossip_sync: &P2PGossipSync<Arc<NetworkGraph<Arc<test_utils::TestLogger>>>, Arc<test_utils::TestChainSource>, Arc<test_utils::TestLogger>>,
 	secp_ctx: &Secp256k1<All>, node_privkey: &SecretKey, features: NodeFeatures, timestamp: u32
 ) {
-	let node_id = PublicKey::from_secret_key(&secp_ctx, node_privkey);
+	let node_id = NodeId::from_pubkey(&PublicKey::from_secret_key(&secp_ctx, node_privkey));
 	let unsigned_announcement = UnsignedNodeAnnouncement {
 		features,
 		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(),
@@ -139,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:
@@ -193,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:
 	//