f take node id in forward_intercept

Author: valentinewallace

lightning/src/ln/channelmanager.rs

@@ -3168,12 +3168,14 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 	/// LDK to generate an [`HTLCIntercepted`] event when it receives the forwarded HTLC.
 	///
 	/// [`HTLCIntercepted`]: events::Event::HTLCIntercepted
-	pub fn forward_intercepted_htlc(&self, intercept_id: InterceptId, short_channel_id: u64, amt_to_forward_msat: u64) -> Result<(), APIError> {
+	// TODO: when we move to deciding the best outbound channel at forward time, only take
+	// `next_node_id` and not `next_hop_scid`
+	pub fn forward_intercepted_htlc(&self, intercept_id: InterceptId, next_hop_scid: u64, _next_node_id: PublicKey, amt_to_forward_msat: u64) -> Result<(), APIError> {
 		let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
 
-		if self.short_to_chan_info.read().unwrap().get(&short_channel_id).is_none() {
+		if self.short_to_chan_info.read().unwrap().get(&next_hop_scid).is_none() {
 			return Err(APIError::APIMisuseError {
-				err: format!("Channel with short channel id {:?} not found", short_channel_id)
+				err: format!("Channel with short channel id {:?} not found", next_hop_scid)
 			})
 		}
 
@@ -3184,7 +3186,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 
 		let routing = match payment.forward_info.routing {
 			PendingHTLCRouting::Forward { onion_packet, .. } => {
-				PendingHTLCRouting::Forward { onion_packet, short_channel_id }
+				PendingHTLCRouting::Forward { onion_packet, short_channel_id: next_hop_scid }
 			},
 			_ => unreachable!()
 		};

lightning/src/ln/payment_tests.rs

@@ -1458,19 +1458,19 @@ fn forward_intercepted_payment() {
 	};
 
 	// Check for unknown scid error.
-	let unknown_scid_err = nodes[1].node.forward_intercepted_htlc(intercept_id, 4242, expected_outbound_amount_msat).unwrap_err();
+	let unknown_scid_err = nodes[1].node.forward_intercepted_htlc(intercept_id, 4242, nodes[2].node.get_our_node_id(), expected_outbound_amount_msat).unwrap_err();
 	assert_eq!(unknown_scid_err, APIError::APIMisuseError { err: "Channel with short channel id 4242 not found".to_string() });
 
 	// Open the just-in-time channel so the payment can then be forwarded.
 	let scid = create_announced_chan_between_nodes(&nodes, 1, 2, channelmanager::provided_init_features(), channelmanager::provided_init_features()).0.contents.short_channel_id;
 
 	// Check for unknown intercept id error.
 	let unknown_intercept_id = InterceptId([42; 32]);
-	let unknown_intercept_id_err = nodes[1].node.forward_intercepted_htlc(unknown_intercept_id, scid, expected_outbound_amount_msat).unwrap_err();
+	let unknown_intercept_id_err = nodes[1].node.forward_intercepted_htlc(unknown_intercept_id, scid, nodes[2].node.get_our_node_id(), expected_outbound_amount_msat).unwrap_err();
 	assert_eq!(unknown_intercept_id_err , APIError::APIMisuseError { err: format!("Payment with intercept id {:?} not found", unknown_intercept_id.0) });
 
 	// Finally, forward the intercepted payment through and claim it.
-	nodes[1].node.forward_intercepted_htlc(intercept_id, scid, expected_outbound_amount_msat).unwrap();
+	nodes[1].node.forward_intercepted_htlc(intercept_id, scid, nodes[2].node.get_our_node_id(), expected_outbound_amount_msat).unwrap();
 	expect_pending_htlcs_forwardable!(nodes[1]);
 
 	let payment_event = {