f adapt to adding RouteHop for intro node

Author: valentinewallace

lightning/src/routing/router.rs

@@ -175,13 +175,7 @@ impl InFlightHtlcs {
 
 		let mut cumulative_msat = 0;
 		if let Some(tail) = &path.blinded_tail {
-			cumulative_msat += tail.final_value_msat + tail.fee_msat;
-			self.0
-				.entry((tail.intro_node_scid,
-						NodeId::from_pubkey(&path.hops.last().map_or(payer_node_id, |hop| hop.pubkey)) <
-						NodeId::from_pubkey(&tail.path.introduction_node_id)))
-				.and_modify(|used_liquidity_msat| *used_liquidity_msat += cumulative_msat)
-				.or_insert(cumulative_msat);
+			cumulative_msat += tail.final_value_msat;
 		}
 
 		// total_inflight_map needs to be direction-sensitive when keeping track of the HTLC value
@@ -303,7 +297,7 @@ pub struct Path {
 impl Path {
 	/// The length of this path, including the hops of its [`Path::blinded_tail`], if any.
 	pub fn len(&self) -> usize {
-		self.hops.len() + self.blinded_tail.as_ref().map_or(0, |tail| tail.path.blinded_hops.len())
+		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
 	}
 }
 
@@ -2264,7 +2258,7 @@ fn build_route_from_hops_internal<L: Deref>(
 
 #[cfg(test)]
 mod tests {
-	use crate::blinded_path::BlindedPath;
+	use crate::blinded_path::{BlindedHop, BlindedPath};
 	use crate::routing::gossip::{NetworkGraph, P2PGossipSync, NodeId, EffectiveCapacity};
 	use crate::routing::utxo::UtxoResult;
 	use crate::routing::router::{get_route, build_route_from_hops_internal, add_random_cltv_offset, default_node_features,
@@ -5768,8 +5762,14 @@ mod tests {
 
 	#[test]
 	fn blinded_path_inflight_processing() {
-		// Ensure we'll score the channel that's inbound to a blinded path's introduction node.
+		// Ensure we'll score the channel that's inbound to a blinded path's introduction node, and
+		// account for the blinded tail's final amount_msat.
 		let mut inflight_htlcs = InFlightHtlcs::new();
+		let blinded_path = BlindedPath {
+			introduction_node_id: ln_test_utils::pubkey(43),
+			blinding_point: ln_test_utils::pubkey(48),
+			blinded_hops: vec![BlindedHop { blinded_node_id: ln_test_utils::pubkey(49), encrypted_payload: Vec::new() }],
+		};
 		let path = Path {
 			hops: vec![RouteHop {
 				pubkey: ln_test_utils::pubkey(42),
@@ -5778,16 +5778,19 @@ mod tests {
 				channel_features: ChannelFeatures::empty(),
 				fee_msat: 100,
 				cltv_expiry_delta: 0,
-			}],
-			blinded_tail: Some(BlindedTail {
-				path: BlindedPath {
-					introduction_node_id: ln_test_utils::pubkey(43),
-					blinding_point: ln_test_utils::pubkey(44),
-					blinded_hops: Vec::new(),
-				},
-				intro_node_scid: 43,
+			},
+			RouteHop {
+				pubkey: blinded_path.introduction_node_id,
+				node_features: NodeFeatures::empty(),
+				short_channel_id: 43,
+				channel_features: ChannelFeatures::empty(),
 				fee_msat: 1,
 				cltv_expiry_delta: 0,
+			}],
+			blinded_tail: Some(BlindedTail {
+				hops: blinded_path.blinded_hops,
+				blinding_point: blinded_path.blinding_point,
+				final_cltv_expiry_delta: 0,
 				final_value_msat: 200,
 			}),
 		};