Update expect_splice_failed_events to assert on channel_id

Change the expect_splice_failed_events helper to take expected_channel_id
instead of expected_counterparty_node_id, providing more specific
assertions and consistency with expect_discard_funding_event.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: jkczyz

lightning/src/ln/functional_test_utils.rs

@@ -3203,14 +3203,14 @@ pub fn expect_splice_pending_event<'a, 'b, 'c, 'd>(
 
 #[cfg(any(test, ldk_bench, feature = "_test_utils"))]
 pub fn expect_splice_failed_events<'a, 'b, 'c, 'd>(
-	node: &'a Node<'b, 'c, 'd>, expected_counterparty_node_id: &PublicKey,
+	node: &'a Node<'b, 'c, 'd>, expected_channel_id: &ChannelId,
 	funding_contribution: FundingContribution,
 ) {
 	let events = node.node.get_and_clear_pending_events();
 	assert_eq!(events.len(), 2);
 	match &events[0] {
-		Event::SpliceFailed { channel_id: _, counterparty_node_id, .. } => {
-			assert_eq!(*expected_counterparty_node_id, *counterparty_node_id);
+		Event::SpliceFailed { channel_id, .. } => {
+			assert_eq!(*expected_channel_id, *channel_id);
 		},
 		_ => panic!("Unexpected event"),
 	}

lightning/src/ln/splicing_tests.rs

@@ -562,7 +562,7 @@ fn do_test_splice_state_reset_on_disconnect(reload: bool) {
 		nodes[1].node.peer_disconnected(node_id_0);
 	}
 
-	expect_splice_failed_events(&nodes[0], &node_id_1, funding_contribution);
+	expect_splice_failed_events(&nodes[0], &channel_id, funding_contribution);
 
 	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 	reconnect_args.send_channel_ready = (true, true);
@@ -613,7 +613,7 @@ fn do_test_splice_state_reset_on_disconnect(reload: bool) {
 		nodes[1].node.peer_disconnected(node_id_0);
 	}
 
-	expect_splice_failed_events(&nodes[0], &node_id_1, funding_contribution);
+	expect_splice_failed_events(&nodes[0], &channel_id, funding_contribution);
 
 	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 	reconnect_args.send_channel_ready = (true, true);
@@ -695,7 +695,7 @@ fn do_test_splice_state_reset_on_disconnect(reload: bool) {
 
 	let tx_abort = get_event_msg!(nodes[0], MessageSendEvent::SendTxAbort, node_id_1);
 	nodes[1].node.handle_tx_abort(node_id_0, &tx_abort);
-	expect_splice_failed_events(&nodes[0], &node_id_1, funding_contribution);
+	expect_splice_failed_events(&nodes[0], &channel_id, funding_contribution);
 
 	// Attempt a splice negotiation that completes, (i.e. `tx_signatures` are exchanged). Reconnecting
 	// should not abort the negotiation or reset the splice state.
@@ -777,7 +777,7 @@ fn test_config_reject_inbound_splices() {
 	nodes[0].node.peer_disconnected(node_id_1);
 	nodes[1].node.peer_disconnected(node_id_0);
 
-	expect_splice_failed_events(&nodes[0], &node_id_1, funding_contribution);
+	expect_splice_failed_events(&nodes[0], &channel_id, funding_contribution);
 
 	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 	reconnect_args.send_channel_ready = (true, true);
@@ -1966,7 +1966,7 @@ fn fail_splice_on_interactive_tx_error() {
 		get_event_msg!(acceptor, MessageSendEvent::SendTxComplete, node_id_initiator);
 	initiator.node.handle_tx_add_input(node_id_acceptor, &tx_add_input);
 
-	expect_splice_failed_events(initiator, &node_id_acceptor, funding_contribution);
+	expect_splice_failed_events(initiator, &channel_id, funding_contribution);
 
 	let tx_abort = get_event_msg!(initiator, MessageSendEvent::SendTxAbort, node_id_acceptor);
 	acceptor.node.handle_tx_abort(node_id_initiator, &tx_abort);
@@ -2015,7 +2015,7 @@ fn fail_splice_on_tx_abort() {
 	let tx_abort = get_event_msg!(acceptor, MessageSendEvent::SendTxAbort, node_id_initiator);
 	initiator.node.handle_tx_abort(node_id_acceptor, &tx_abort);
 
-	expect_splice_failed_events(initiator, &node_id_acceptor, funding_contribution);
+	expect_splice_failed_events(initiator, &channel_id, funding_contribution);
 
 	let tx_abort = get_event_msg!(initiator, MessageSendEvent::SendTxAbort, node_id_acceptor);
 	acceptor.node.handle_tx_abort(node_id_initiator, &tx_abort);
@@ -2828,7 +2828,7 @@ fn test_funding_contributed_channel_shutdown() {
 		})
 	);
 
-	expect_splice_failed_events(&nodes[0], &node_id_1, funding_contribution);
+	expect_splice_failed_events(&nodes[0], &channel_id, funding_contribution);
 }
 
 #[test]