f - reuse public_introduction_node_id

Author: jkczyz

lightning/src/onion_message/messenger.rs

@@ -15,7 +15,7 @@ use bitcoin::hashes::hmac::{Hmac, HmacEngine};
 use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};
 
-use crate::blinded_path::{BlindedPath, Direction, IntroductionNode};
+use crate::blinded_path::{BlindedPath, IntroductionNode};
 use crate::blinded_path::message::{advance_path_by_one, ForwardTlvs, NextHop, ReceiveTlvs};
 use crate::blinded_path::utils;
 use crate::events::{Event, EventHandler, EventsProvider};
@@ -445,17 +445,12 @@ impl Destination {
 	/// provided [`ReadOnlyNetworkGraph`].
 	pub fn resolve(&mut self, network_graph: &ReadOnlyNetworkGraph) {
 		if let Destination::BlindedPath(path) = self {
-			let introduction_node = &mut path.introduction_node;
-			if let IntroductionNode::DirectedShortChannelId(direction, scid) = introduction_node {
-				let pubkey = network_graph
-					.channel(*scid)
-					.map(|c| match direction {
-						Direction::NodeOne => c.node_one,
-						Direction::NodeTwo => c.node_two,
-					})
-					.and_then(|node_id| node_id.as_pubkey().ok());
-				if let Some(pubkey) = pubkey {
-					*introduction_node = IntroductionNode::NodeId(pubkey);
+			if let IntroductionNode::DirectedShortChannelId(..) = path.introduction_node {
+				if let Some(pubkey) = path
+					.public_introduction_node_id(network_graph)
+					.and_then(|node_id| node_id.as_pubkey().ok())
+				{
+					path.introduction_node = IntroductionNode::NodeId(pubkey);
 				}
 			}
 		}