X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Frouter.rs;h=b01d853be334cf3635d7f116ba0b878d8648ac43;hb=63ebaccca3c284c28f24537c2c0c034f9cc9c3c4;hp=8e59c9bd46f5ff5edeed994adb96d2667a0acfc3;hpb=670b41ae4ec1b45fad97ed813a4296410839ecaf;p=rust-lightning

diff --git a/lightning/src/routing/router.rs b/lightning/src/routing/router.rs
index 8e59c9bd..b01d853b 100644
--- a/lightning/src/routing/router.rs
+++ b/lightning/src/routing/router.rs
@@ -986,7 +986,7 @@ impl Payee {
 			_ => None,
 		}
 	}
-	fn blinded_route_hints(&self) -> &[(BlindedPayInfo, BlindedPath)] {
+	pub(crate) fn blinded_route_hints(&self) -> &[(BlindedPayInfo, BlindedPath)] {
 		match self {
 			Self::Blinded { route_hints, .. } => &route_hints[..],
 			Self::Clear { .. } => &[]
@@ -1863,17 +1863,17 @@ where L::Target: Logger {
 			}
 		},
 		Payee::Blinded { route_hints, .. } => {
-			if route_hints.iter().all(|(_, path)| &path.introduction_node_id == our_node_pubkey) {
+			if route_hints.iter().all(|(_, path)| path.public_introduction_node_id(network_graph) == Some(&our_node_id)) {
 				return Err(LightningError{err: "Cannot generate a route to blinded paths if we are the introduction node to all of them".to_owned(), action: ErrorAction::IgnoreError});
 			}
 			for (_, blinded_path) in route_hints.iter() {
 				if blinded_path.blinded_hops.len() == 0 {
 					return Err(LightningError{err: "0-hop blinded path provided".to_owned(), action: ErrorAction::IgnoreError});
-				} else if &blinded_path.introduction_node_id == our_node_pubkey {
+				} else if blinded_path.public_introduction_node_id(network_graph) == Some(&our_node_id) {
 					log_info!(logger, "Got blinded path with ourselves as the introduction node, ignoring");
 				} else if blinded_path.blinded_hops.len() == 1 &&
 					route_hints.iter().any( |(_, p)| p.blinded_hops.len() == 1
-						&& p.introduction_node_id != blinded_path.introduction_node_id)
+						&& p.public_introduction_node_id(network_graph) != blinded_path.public_introduction_node_id(network_graph))
 				{
 					return Err(LightningError{err: format!("1-hop blinded paths must all have matching introduction node ids"), action: ErrorAction::IgnoreError});
 				}
@@ -3259,8 +3259,6 @@ mod tests {
 	use crate::prelude::*;
 	use crate::sync::Arc;
 
-	use core::convert::TryInto;
-
 	fn get_channel_details(short_channel_id: Option<u64>, node_id: PublicKey,
 			features: InitFeatures, outbound_capacity_msat: u64) -> channelmanager::ChannelDetails {
 		channelmanager::ChannelDetails {
@@ -5303,10 +5301,15 @@ mod tests {
 				if let Some(bt) = &path.blinded_tail {
 					assert_eq!(path.hops.len() + if bt.hops.len() == 1 { 0 } else { 1 }, 2);
 					if bt.hops.len() > 1 {
-						assert_eq!(path.hops.last().unwrap().pubkey,
+						let network_graph = network_graph.read_only();
+						assert_eq!(
+							NodeId::from_pubkey(&path.hops.last().unwrap().pubkey),
 							payment_params.payee.blinded_route_hints().iter()
 								.find(|(p, _)| p.htlc_maximum_msat == path.final_value_msat())
-								.map(|(_, p)| p.introduction_node_id).unwrap());
+								.and_then(|(_, p)| p.public_introduction_node_id(&network_graph))
+								.copied()
+								.unwrap()
+						);
 					} else {
 						assert_eq!(path.hops.last().unwrap().pubkey, nodes[2]);
 					}
@@ -7434,7 +7437,10 @@ mod tests {
 		assert_eq!(tail.final_value_msat, 1001);
 
 		let final_hop = route.paths[0].hops.last().unwrap();
-		assert_eq!(final_hop.pubkey, blinded_path.introduction_node_id);
+		assert_eq!(
+			NodeId::from_pubkey(&final_hop.pubkey),
+			*blinded_path.public_introduction_node_id(&network_graph).unwrap()
+		);
 		if tail.hops.len() > 1 {
 			assert_eq!(final_hop.fee_msat,
 				blinded_payinfo.fee_base_msat as u64 + blinded_payinfo.fee_proportional_millionths as u64 * tail.final_value_msat / 1000000);
@@ -8344,17 +8350,14 @@ pub(crate) mod bench_utils {
 	use std::time::Duration;
 
 	use bitcoin::hashes::Hash;
-	use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};
+	use bitcoin::secp256k1::SecretKey;
 
 	use crate::chain::transaction::OutPoint;
 	use crate::routing::scoring::ScoreUpdate;
-	use crate::sign::{EntropySource, KeysManager};
+	use crate::sign::KeysManager;
 	use crate::ln::ChannelId;
-	use crate::ln::channelmanager::{self, ChannelCounterparty, ChannelDetails};
-	use crate::ln::features::Bolt11InvoiceFeatures;
-	use crate::routing::gossip::NetworkGraph;
+	use crate::ln::channelmanager::{self, ChannelCounterparty};
 	use crate::util::config::UserConfig;
-	use crate::util::ser::ReadableArgs;
 	use crate::util::test_utils::TestLogger;
 
 	/// Tries to open a network graph file, or panics with a URL to fetch it.