Support capturing tx_abort send within channel reestablish tests

Backport of 0cdcf54

Author: wpaulino

lightning/src/ln/async_signer_tests.rs

@@ -596,7 +596,7 @@ fn do_test_async_raa_peer_disconnect(
 	}
 
 	// Expect the RAA
-	let (_, revoke_and_ack, commitment_signed, resend_order, _, _, _) =
+	let (_, revoke_and_ack, commitment_signed, resend_order, _, _, _, _) =
 		handle_chan_reestablish_msgs!(dst, src);
 	if test_case == UnblockSignerAcrossDisconnectCase::AtEnd {
 		assert!(revoke_and_ack.is_none());
@@ -612,14 +612,14 @@ fn do_test_async_raa_peer_disconnect(
 	dst.node.signer_unblocked(Some((src_node_id, chan_id)));
 
 	if test_case == UnblockSignerAcrossDisconnectCase::AtEnd {
-		let (_, revoke_and_ack, commitment_signed, resend_order, _, _, _) =
+		let (_, revoke_and_ack, commitment_signed, resend_order, _, _, _, _) =
 			handle_chan_reestablish_msgs!(dst, src);
 		assert!(revoke_and_ack.is_some());
 		assert!(commitment_signed.is_some());
 		assert!(resend_order == RAACommitmentOrder::RevokeAndACKFirst);
 	} else {
 		// Make sure we don't double send the RAA.
-		let (_, revoke_and_ack, commitment_signed, _, _, _, _) =
+		let (_, revoke_and_ack, commitment_signed, _, _, _, _, _) =
 			handle_chan_reestablish_msgs!(dst, src);
 		assert!(revoke_and_ack.is_none());
 		assert!(commitment_signed.is_none());
@@ -746,7 +746,7 @@ fn do_test_async_commitment_signature_peer_disconnect(
 	}
 
 	// Expect the RAA
-	let (_, revoke_and_ack, commitment_signed, _, _, _, _) =
+	let (_, revoke_and_ack, commitment_signed, _, _, _, _, _) =
 		handle_chan_reestablish_msgs!(dst, src);
 	assert!(revoke_and_ack.is_some());
 	if test_case == UnblockSignerAcrossDisconnectCase::AtEnd {
@@ -760,11 +760,11 @@ fn do_test_async_commitment_signature_peer_disconnect(
 	dst.node.signer_unblocked(Some((src_node_id, chan_id)));
 
 	if test_case == UnblockSignerAcrossDisconnectCase::AtEnd {
-		let (_, _, commitment_signed, _, _, _, _) = handle_chan_reestablish_msgs!(dst, src);
+		let (_, _, commitment_signed, _, _, _, _, _) = handle_chan_reestablish_msgs!(dst, src);
 		assert!(commitment_signed.is_some());
 	} else {
 		// Make sure we don't double send the CS.
-		let (_, _, commitment_signed, _, _, _, _) = handle_chan_reestablish_msgs!(dst, src);
+		let (_, _, commitment_signed, _, _, _, _, _) = handle_chan_reestablish_msgs!(dst, src);
 		assert!(commitment_signed.is_none());
 	}
 }
@@ -882,6 +882,7 @@ fn do_test_async_commitment_signature_ordering(monitor_update_failure: bool) {
 	assert!(as_resp.4.is_none());
 	assert!(as_resp.5.is_none());
 	assert!(as_resp.6.is_none());
+	assert!(as_resp.7.is_none());
 
 	if monitor_update_failure {
 		chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
@@ -904,6 +905,7 @@ fn do_test_async_commitment_signature_ordering(monitor_update_failure: bool) {
 	assert!(as_resp.4.is_none());
 	assert!(as_resp.5.is_none());
 	assert!(as_resp.6.is_none());
+	assert!(as_resp.7.is_none());
 
 	nodes[0].enable_channel_signer_op(&node_b_id, &chan_id, SignerOp::SignCounterpartyCommitment);
 	nodes[0].node.signer_unblocked(Some((node_b_id, chan_id)));
@@ -929,6 +931,9 @@ fn do_test_async_commitment_signature_ordering(monitor_update_failure: bool) {
 	assert!(as_resp.6.is_none());
 	assert!(bs_resp.6.is_none());
 
+	assert!(as_resp.7.is_none());
+	assert!(bs_resp.7.is_none());
+
 	// Now that everything is restored, get the CS + RAA and handle them.
 	nodes[1]
 		.node

lightning/src/ln/functional_test_utils.rs

@@ -4996,9 +4996,17 @@ macro_rules! handle_chan_reestablish_msgs {
 	($src_node: expr, $dst_node: expr) => {{
 		let msg_events = $src_node.node.get_and_clear_pending_msg_events();
 		let mut idx = 0;
+
+		let mut tx_abort = None;
+		if let Some(&MessageSendEvent::SendTxAbort { ref node_id, ref msg }) = msg_events.get(idx) {
+			idx += 1;
+			assert_eq!(*node_id, $dst_node.node.get_our_node_id());
+			tx_abort = Some(msg.clone());
+		}
+
 		let channel_ready =
 			if let Some(&MessageSendEvent::SendChannelReady { ref node_id, ref msg }) =
-				msg_events.get(0)
+				msg_events.get(idx)
 			{
 				idx += 1;
 				assert_eq!(*node_id, $dst_node.node.get_our_node_id());
@@ -5115,6 +5123,7 @@ macro_rules! handle_chan_reestablish_msgs {
 			announcement_sigs,
 			tx_signatures,
 			stfu,
+			tx_abort,
 		)
 	}};
 }
@@ -5127,6 +5136,7 @@ pub struct ReconnectArgs<'a, 'b, 'c, 'd> {
 	pub send_stfu: (bool, bool),
 	pub send_interactive_tx_commit_sig: (bool, bool),
 	pub send_interactive_tx_sigs: (bool, bool),
+	pub send_tx_abort: (bool, bool),
 	pub expect_renegotiated_funding_locked_monitor_update: (bool, bool),
 	pub pending_responding_commitment_signed: (bool, bool),
 	/// Indicates that the pending responding commitment signed will be a dup for the recipient,
@@ -5150,6 +5160,7 @@ impl<'a, 'b, 'c, 'd> ReconnectArgs<'a, 'b, 'c, 'd> {
 			send_stfu: (false, false),
 			send_interactive_tx_commit_sig: (false, false),
 			send_interactive_tx_sigs: (false, false),
+			send_tx_abort: (false, false),
 			expect_renegotiated_funding_locked_monitor_update: (false, false),
 			pending_responding_commitment_signed: (false, false),
 			pending_responding_commitment_signed_dup_monitor: (false, false),
@@ -5174,6 +5185,7 @@ pub fn reconnect_nodes<'a, 'b, 'c, 'd>(args: ReconnectArgs<'a, 'b, 'c, 'd>) {
 		send_stfu,
 		send_interactive_tx_commit_sig,
 		send_interactive_tx_sigs,
+		send_tx_abort,
 		expect_renegotiated_funding_locked_monitor_update,
 		pending_htlc_adds,
 		pending_htlc_claims,
@@ -5305,6 +5317,12 @@ pub fn reconnect_nodes<'a, 'b, 'c, 'd>(args: ReconnectArgs<'a, 'b, 'c, 'd>) {
 				&commitment_update.commitment_signed,
 			)
 		}
+		if send_tx_abort.0 {
+			let tx_abort = chan_msgs.7.take().unwrap();
+			node_a.node.handle_tx_abort(node_b_id, &tx_abort);
+		} else {
+			assert!(chan_msgs.7.is_none());
+		}
 		if send_interactive_tx_sigs.0 {
 			let tx_signatures = chan_msgs.5.take().unwrap();
 			node_a.node.handle_tx_signatures(node_b_id, &tx_signatures);
@@ -5417,6 +5435,12 @@ pub fn reconnect_nodes<'a, 'b, 'c, 'd>(args: ReconnectArgs<'a, 'b, 'c, 'd>) {
 				&commitment_update.commitment_signed,
 			)
 		}
+		if send_tx_abort.1 {
+			let tx_abort = chan_msgs.7.take().unwrap();
+			node_a.node.handle_tx_abort(node_b_id, &tx_abort);
+		} else {
+			assert!(chan_msgs.7.is_none());
+		}
 		if send_interactive_tx_sigs.1 {
 			let tx_signatures = chan_msgs.5.take().unwrap();
 			node_b.node.handle_tx_signatures(node_a_id, &tx_signatures);