X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Fscoring.rs;h=31158d41bc37570b7f95a98b5fb48bb9b68ea52d;hb=8311581fe110a9ee561a6fda6b55c78a02068d43;hp=5cc9f2965763dc98b64b0c4a6be8dec07c7685eb;hpb=3f32f60ae7e75a4be96d3d5adc8d18b53445e5e5;p=rust-lightning

diff --git a/lightning/src/routing/scoring.rs b/lightning/src/routing/scoring.rs
index 5cc9f296..31158d41 100644
--- a/lightning/src/routing/scoring.rs
+++ b/lightning/src/routing/scoring.rs
@@ -260,7 +260,7 @@ impl<'a, S: Writeable> Writeable for MutexGuard<'a, S> {
 }
 
 /// Proposed use of a channel passed as a parameter to [`Score::channel_penalty_msat`].
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub struct ChannelUsage {
 	/// The amount to send through the channel, denominated in millisatoshis.
 	pub amount_msat: u64,
@@ -1759,8 +1759,7 @@ mod tests {
 	}
 
 	fn network_graph(logger: &TestLogger) -> NetworkGraph<&TestLogger> {
-		let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
-		let mut network_graph = NetworkGraph::new(genesis_hash, logger);
+		let mut network_graph = NetworkGraph::new(Network::Testnet, logger);
 		add_channel(&mut network_graph, 42, source_privkey(), target_privkey());
 		add_channel(&mut network_graph, 43, target_privkey(), recipient_privkey());
 
@@ -1779,10 +1778,10 @@ mod tests {
 			features: channelmanager::provided_channel_features(&UserConfig::default()),
 			chain_hash: genesis_hash,
 			short_channel_id,
-			node_id_1: PublicKey::from_secret_key(&secp_ctx, &node_1_key),
-			node_id_2: PublicKey::from_secret_key(&secp_ctx, &node_2_key),
-			bitcoin_key_1: PublicKey::from_secret_key(&secp_ctx, &node_1_secret),
-			bitcoin_key_2: PublicKey::from_secret_key(&secp_ctx, &node_2_secret),
+			node_id_1: NodeId::from_pubkey(&PublicKey::from_secret_key(&secp_ctx, &node_1_key)),
+			node_id_2: NodeId::from_pubkey(&PublicKey::from_secret_key(&secp_ctx, &node_2_key)),
+			bitcoin_key_1: NodeId::from_pubkey(&PublicKey::from_secret_key(&secp_ctx, &node_1_secret)),
+			bitcoin_key_2: NodeId::from_pubkey(&PublicKey::from_secret_key(&secp_ctx, &node_2_secret)),
 			excess_data: Vec::new(),
 		};
 		let msghash = hash_to_message!(&Sha256dHash::hash(&unsigned_announcement.encode()[..])[..]);
@@ -2226,8 +2225,7 @@ mod tests {
 		// we do not score such channels.
 		let secp_ctx = Secp256k1::new();
 		let logger = TestLogger::new();
-		let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
-		let mut network_graph = NetworkGraph::new(genesis_hash, &logger);
+		let mut network_graph = NetworkGraph::new(Network::Testnet, &logger);
 		let secret_a = SecretKey::from_slice(&[42; 32]).unwrap();
 		let secret_b = SecretKey::from_slice(&[43; 32]).unwrap();
 		let secret_c = SecretKey::from_slice(&[44; 32]).unwrap();