f add helper for iters

Author: valentinewallace

lightning/src/routing/router.rs

@@ -308,6 +308,11 @@ impl Path {
 	pub fn len(&self) -> usize {
 		self.hops.len() + self.blinded_tail.as_ref().map_or(0, |tail| tail.hops.len().saturating_sub(1)) // Don't double count the intro node
 	}
+
+	pub(super) fn node_id_scid_iter(&self) -> impl Iterator<Item=(PublicKey, u64)> + '_ {
+		self.hops.iter().map(|hop| (hop.pubkey, hop.short_channel_id))
+			.chain(self.blinded_tail.as_ref().map(|tail| (tail.path.introduction_node_id, tail.intro_node_scid)))
+	}
 }
 
 /// A route directs a payment from the sender (us) to the recipient. If the recipient supports MPP,

lightning/src/routing/scoring.rs

@@ -1237,10 +1237,7 @@ impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, T: Time> Score for Probabilis
 		let amount_msat = path.final_value_msat();
 		log_trace!(self.logger, "Scoring path through to SCID {} as having failed at {} msat", short_channel_id, amount_msat);
 		let network_graph = self.network_graph.read_only();
-		for (hop_idx, (pubkey, scid)) in path.hops.iter().map(|hop| (hop.pubkey, hop.short_channel_id))
-			.chain(path.blinded_tail.as_ref().map(|tail| (tail.path.introduction_node_id, tail.intro_node_scid)))
-			.enumerate()
-		{
+		for (hop_idx, (pubkey, scid)) in path.node_id_scid_iter().enumerate() {
 			let target = NodeId::from_pubkey(&pubkey);
 			let channel_directed_from_source = network_graph.channels()
 				.get(&scid)
@@ -1283,9 +1280,7 @@ impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, T: Time> Score for Probabilis
 		log_trace!(self.logger, "Scoring path through SCID {} as having succeeded at {} msat.",
 			final_scid, amount_msat);
 		let network_graph = self.network_graph.read_only();
-		for (pubkey, scid) in path.hops.iter().map(|hop| (hop.pubkey, hop.short_channel_id))
-			.chain(path.blinded_tail.as_ref().map(|tail| (tail.path.introduction_node_id, tail.intro_node_scid)))
-		{
+		for (pubkey, scid) in path.node_id_scid_iter() {
 			let target = NodeId::from_pubkey(&pubkey);
 			let channel_directed_from_source = network_graph.channels()
 				.get(&scid)