f adapt to having a RouteHop for the intro node

Author: valentinewallace

lightning/src/routing/router.rs

@@ -2106,7 +2106,7 @@ fn add_random_cltv_offset(route: &mut Route, payment_params: &PaymentParameters,
 	let network_nodes = network_graph.nodes();
 
 	for path in route.paths.iter_mut() {
-		if path.blinded_tail.as_ref().map_or(false, |tail| tail.path.blinded_hops.len() > 1) { continue }
+		if path.blinded_tail.as_ref().map_or(false, |tail| tail.hops.len() > 1) { continue }
 
 		let mut shadow_ctlv_expiry_delta_offset: u32 = 0;
 
@@ -2177,9 +2177,10 @@ fn add_random_cltv_offset(route: &mut Route, payment_params: &PaymentParameters,
 
 		// Add 'shadow' CLTV offset to the final hop
 		if let Some(tail) = path.blinded_tail.as_mut() {
-			tail.cltv_expiry_delta = tail.cltv_expiry_delta
-				.checked_add(shadow_ctlv_expiry_delta_offset).unwrap_or(tail.cltv_expiry_delta);
-		} else if let Some(last_hop) = path.hops.last_mut() {
+			tail.final_cltv_expiry_delta = tail.final_cltv_expiry_delta
+				.checked_add(shadow_ctlv_expiry_delta_offset).unwrap_or(tail.final_cltv_expiry_delta);
+		}
+		if let Some(last_hop) = path.hops.last_mut() {
 			last_hop.cltv_expiry_delta = last_hop.cltv_expiry_delta
 				.checked_add(shadow_ctlv_expiry_delta_offset).unwrap_or(last_hop.cltv_expiry_delta);
 		}
@@ -5811,6 +5812,14 @@ mod tests {
 	#[test]
 	fn blinded_path_cltv_shadow_offset() {
 		// Don't add a shadow offset to blinded paths with more than 1 hop.
+		let blinded_path = BlindedPath {
+			introduction_node_id: ln_test_utils::pubkey(43),
+			blinding_point: ln_test_utils::pubkey(44),
+			blinded_hops: vec![
+				BlindedHop { blinded_node_id: ln_test_utils::pubkey(45), encrypted_payload: Vec::new() },
+				BlindedHop { blinded_node_id: ln_test_utils::pubkey(46), encrypted_payload: Vec::new() }
+			],
+		};
 		let mut route = Route { paths: vec![Path {
 			hops: vec![RouteHop {
 				pubkey: ln_test_utils::pubkey(42),
@@ -5819,32 +5828,33 @@ 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![
-						BlindedHop { blinded_node_id: ln_test_utils::pubkey(45), encrypted_payload: Vec::new() },
-						BlindedHop { blinded_node_id: ln_test_utils::pubkey(46), encrypted_payload: 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,
 			}),
 		}], payment_params: None};
 
 		let payment_params = PaymentParameters::from_node_id(ln_test_utils::pubkey(47), 18);
 		let (_, network_graph, _, _, _) = build_line_graph();
 		add_random_cltv_offset(&mut route, &payment_params, &network_graph.read_only(), &[0; 32]);
-		assert_eq!(route.paths[0].blinded_tail.as_ref().unwrap().cltv_expiry_delta, 0);
+		assert_eq!(route.paths[0].blinded_tail.as_ref().unwrap().final_cltv_expiry_delta, 0);
 
 		// Add a shadow offset if we're sending to a 1-hop blinded path.
-		route.paths[0].blinded_tail.as_mut().unwrap().path.blinded_hops.pop();
+		route.paths[0].blinded_tail.as_mut().unwrap().hops.pop();
 		add_random_cltv_offset(&mut route, &payment_params, &network_graph.read_only(), &[0; 32]);
-		assert_eq!(route.paths[0].blinded_tail.as_ref().unwrap().cltv_expiry_delta, 40);
+		assert_eq!(route.paths[0].blinded_tail.as_ref().unwrap().final_cltv_expiry_delta, 40);
 	}
 }