Merge pull request #4214 from elnosh/commitment-signed-dance-macro

replace `commitment_signed_dance` macro in test utils

Author: TheBlueMatt

lightning-dns-resolver/src/lib.rs

@@ -180,7 +180,7 @@ mod test {
 	use lightning::types::payment::PaymentHash;
 	use lightning::util::logger::Logger;
 
-	use lightning::{commitment_signed_dance, expect_payment_claimed, get_htlc_update_msgs};
+	use lightning::{expect_payment_claimed, get_htlc_update_msgs};
 	use lightning_types::string::UntrustedString;
 
 	use std::ops::Deref;
@@ -418,7 +418,7 @@ mod test {
 		check_added_monitors(&nodes[0], 1);
 		let updates = get_htlc_update_msgs!(nodes[0], payee_id);
 		nodes[1].node.handle_update_add_htlc(payer_id, &updates.update_add_htlcs[0]);
-		commitment_signed_dance!(nodes[1], nodes[0], updates.commitment_signed, false);
+		do_commitment_signed_dance(&nodes[1], &nodes[0], &updates.commitment_signed, false, false);
 		expect_and_process_pending_htlcs(&nodes[1], false);
 
 		let claimable_events = nodes[1].node.get_and_clear_pending_events();
@@ -452,7 +452,7 @@ mod test {
 		check_added_monitors(&nodes[1], 1);
 		let mut updates = get_htlc_update_msgs!(nodes[1], payer_id);
 		nodes[0].node.handle_update_fulfill_htlc(payee_id, updates.update_fulfill_htlcs.remove(0));
-		commitment_signed_dance!(nodes[0], nodes[1], updates.commitment_signed, false);
+		do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, false, false);
 
 		expect_payment_sent(&nodes[0], our_payment_preimage, None, true, true);
 	}

lightning-tests/src/upgrade_downgrade_tests.rs

@@ -477,14 +477,15 @@ fn do_test_0_1_htlc_forward_after_splice(fail_htlc: bool) {
 
 		let updates = get_htlc_update_msgs(&nodes[1], &node_a_id);
 		nodes[0].node.handle_update_fail_htlc(node_b_id, &updates.update_fail_htlcs[0]);
-		commitment_signed_dance!(nodes[0], nodes[1], updates.commitment_signed, false);
+		do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, false, false);
 		let conditions = PaymentFailedConditions::new();
 		expect_payment_failed_conditions(&nodes[0], pay_hash, false, conditions);
 	} else {
 		check_added_monitors(&nodes[1], 1);
 		let forward_event = SendEvent::from_node(&nodes[1]);
 		nodes[2].node.handle_update_add_htlc(node_b_id, &forward_event.msgs[0]);
-		commitment_signed_dance!(nodes[2], nodes[1], forward_event.commitment_msg, false);
+		let commitment = &forward_event.commitment_msg;
+		do_commitment_signed_dance(&nodes[2], &nodes[1], commitment, false, false);
 
 		expect_and_process_pending_htlcs(&nodes[2], false);
 		expect_payment_claimable!(nodes[2], pay_hash, pay_secret, 1_000_000);

lightning/src/ln/async_payments_tests.rs

@@ -587,7 +587,8 @@ fn lock_in_htlc_for_static_invoice(
 	let payment_hash = update_add.payment_hash;
 	assert!(update_add.hold_htlc.is_some());
 	sender_lsp.node.handle_update_add_htlc(sender.node.get_our_node_id(), &update_add);
-	commitment_signed_dance!(sender_lsp, sender, &commitment_update.commitment_signed, false, true);
+	let commitment = &commitment_update.commitment_signed;
+	do_commitment_signed_dance(sender_lsp, sender, commitment, false, true);
 	payment_hash
 }
 
@@ -3240,7 +3241,7 @@ fn async_payment_mpp() {
 	let payment_hash = update_add.payment_hash;
 	assert!(update_add.hold_htlc.is_some());
 	lsp_a.node.handle_update_add_htlc(sender.node.get_our_node_id(), &update_add);
-	commitment_signed_dance!(lsp_a, sender, &commitment_update.commitment_signed, false, true);
+	do_commitment_signed_dance(lsp_a, sender, &commitment_update.commitment_signed, false, true);
 	lsp_a.node.process_pending_htlc_forwards();
 
 	// HTLC 2
@@ -3252,7 +3253,7 @@ fn async_payment_mpp() {
 	let update_add = commitment_update.update_add_htlcs[0].clone();
 	assert!(update_add.hold_htlc.is_some());
 	lsp_b.node.handle_update_add_htlc(sender.node.get_our_node_id(), &update_add);
-	commitment_signed_dance!(lsp_b, sender, &commitment_update.commitment_signed, false, true);
+	do_commitment_signed_dance(lsp_b, sender, &commitment_update.commitment_signed, false, true);
 	lsp_b.node.process_pending_htlc_forwards();
 
 	// held htlc <> release_htlc dance

lightning/src/ln/blinded_payment_tests.rs

@@ -721,7 +721,7 @@ fn do_blinded_intercept_payment(intercept_node_fails: bool) {
 		SendEvent::from_event(events.remove(0))
 	};
 	nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
-	commitment_signed_dance!(nodes[1], nodes[0], &payment_event.commitment_msg, false, true);
+	do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event.commitment_msg, false, true);
 	expect_and_process_pending_htlcs(&nodes[1], false);
 
 	let events = nodes[1].node.get_and_clear_pending_events();
@@ -761,7 +761,7 @@ fn do_blinded_intercept_payment(intercept_node_fails: bool) {
 		SendEvent::from_event(events.remove(0))
 	};
 	nodes[2].node.handle_update_add_htlc(nodes[1].node.get_our_node_id(), &payment_event.msgs[0]);
-	commitment_signed_dance!(nodes[2], nodes[1], &payment_event.commitment_msg, false, true);
+	do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event.commitment_msg, false, true);
 	expect_and_process_pending_htlcs(&nodes[2], false);
 
 	expect_payment_claimable!(&nodes[2], payment_hash, payment_secret, amt_msat, None, nodes[2].node.get_our_node_id());
@@ -1027,7 +1027,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
 			check_added_monitors!(nodes[2], 1);
 
 			nodes[2].node.handle_shutdown(nodes[1].node.get_our_node_id(), &node_1_shutdown);
-			commitment_signed_dance!(nodes[2], nodes[1], (), false, true, false, false);
+			assert!(commitment_signed_dance_through_cp_raa(&nodes[2], &nodes[1], false, false).is_none());
 			expect_and_process_pending_htlcs(&nodes[2], false);
 			expect_htlc_handling_failed_destinations!(nodes[2].node.get_and_clear_pending_events(), &[HTLCHandlingFailureType::Receive { payment_hash }]);
 			check_added_monitors(&nodes[2], 1);
@@ -1452,7 +1452,7 @@ fn fails_receive_tlvs_authentication() {
 	assert!(update_fail.update_fail_htlcs.len() == 1);
 	let fail_msg = &update_fail.update_fail_htlcs[0];
 	nodes[0].node.handle_update_fail_htlc(nodes[1].node.get_our_node_id(), fail_msg);
-	commitment_signed_dance!(nodes[0], nodes[1], update_fail.commitment_signed, false);
+	do_commitment_signed_dance(&nodes[0], &nodes[1], &update_fail.commitment_signed, false, false);
 	expect_payment_failed_conditions(
 		&nodes[0], payment_hash, true,
 		PaymentFailedConditions::new().expected_htlc_error_data(LocalHTLCFailureReason::InvalidOnionPayload, &[]),

lightning/src/ln/bolt11_payment_tests.rs

@@ -76,7 +76,7 @@ fn payment_metadata_end_to_end_for_invoice_with_amount() {
 	check_added_monitors(&nodes[0], 1);
 	let send_event = SendEvent::from_node(&nodes[0]);
 	nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &send_event.msgs[0]);
-	commitment_signed_dance!(nodes[1], nodes[0], &send_event.commitment_msg, false);
+	do_commitment_signed_dance(&nodes[1], &nodes[0], &send_event.commitment_msg, false, false);
 
 	expect_and_process_pending_htlcs(&nodes[1], false);
 
@@ -144,7 +144,7 @@ fn payment_metadata_end_to_end_for_invoice_with_no_amount() {
 	check_added_monitors(&nodes[0], 1);
 	let send_event = SendEvent::from_node(&nodes[0]);
 	nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &send_event.msgs[0]);
-	commitment_signed_dance!(nodes[1], nodes[0], &send_event.commitment_msg, false);
+	do_commitment_signed_dance(&nodes[1], &nodes[0], &send_event.commitment_msg, false, false);
 
 	expect_and_process_pending_htlcs(&nodes[1], false);