Skip to content

Commit c1097fd

Browse files
elnoshelnosh
committed
Replace commitment_signed_dance for skip_last_step=true
Replace calls to `commitment_signed_dance` macro when skip_last_step=true to instead call `do_commitment_signed_dance`.
1 parent 80965fa commit c1097fd

15 files changed

+117
-110
lines changed

‎lightning/src/ln/async_payments_tests.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,8 @@ fn lock_in_htlc_for_static_invoice(
587587
let payment_hash = update_add.payment_hash;
588588
assert!(update_add.hold_htlc.is_some());
589589
sender_lsp.node.handle_update_add_htlc(sender.node.get_our_node_id(), &update_add);
590-
commitment_signed_dance!(sender_lsp, sender, &commitment_update.commitment_signed, false, true);
590+
let commitment = &commitment_update.commitment_signed;
591+
do_commitment_signed_dance(sender_lsp, sender, commitment, false, true);
591592
payment_hash
592593
}
593594

@@ -3240,7 +3241,7 @@ fn async_payment_mpp() {
32403241
let payment_hash = update_add.payment_hash;
32413242
assert!(update_add.hold_htlc.is_some());
32423243
lsp_a.node.handle_update_add_htlc(sender.node.get_our_node_id(), &update_add);
3243-
commitment_signed_dance!(lsp_a, sender, &commitment_update.commitment_signed, false, true);
3244+
do_commitment_signed_dance(lsp_a, sender, &commitment_update.commitment_signed, false, true);
32443245
lsp_a.node.process_pending_htlc_forwards();
32453246

32463247
// HTLC 2
@@ -3252,7 +3253,7 @@ fn async_payment_mpp() {
32523253
let update_add = commitment_update.update_add_htlcs[0].clone();
32533254
assert!(update_add.hold_htlc.is_some());
32543255
lsp_b.node.handle_update_add_htlc(sender.node.get_our_node_id(), &update_add);
3255-
commitment_signed_dance!(lsp_b, sender, &commitment_update.commitment_signed, false, true);
3256+
do_commitment_signed_dance(lsp_b, sender, &commitment_update.commitment_signed, false, true);
32563257
lsp_b.node.process_pending_htlc_forwards();
32573258

32583259
// held htlc <> release_htlc dance

‎lightning/src/ln/blinded_payment_tests.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ fn do_blinded_intercept_payment(intercept_node_fails: bool) {
721721
SendEvent::from_event(events.remove(0))
722722
};
723723
nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
724-
commitment_signed_dance!(nodes[1], nodes[0], &payment_event.commitment_msg, false, true);
724+
do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event.commitment_msg, false, true);
725725
expect_and_process_pending_htlcs(&nodes[1], false);
726726

727727
let events = nodes[1].node.get_and_clear_pending_events();
@@ -761,7 +761,7 @@ fn do_blinded_intercept_payment(intercept_node_fails: bool) {
761761
SendEvent::from_event(events.remove(0))
762762
};
763763
nodes[2].node.handle_update_add_htlc(nodes[1].node.get_our_node_id(), &payment_event.msgs[0]);
764-
commitment_signed_dance!(nodes[2], nodes[1], &payment_event.commitment_msg, false, true);
764+
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event.commitment_msg, false, true);
765765
expect_and_process_pending_htlcs(&nodes[2], false);
766766

767767
expect_payment_claimable!(&nodes[2], payment_hash, payment_secret, amt_msat, None, nodes[2].node.get_our_node_id());

‎lightning/src/ln/chanmon_update_fail_tests.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,7 +1047,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
10471047
chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed); // We succeed in updating the monitor for the first channel
10481048
send_event = SendEvent::from_event(nodes[0].node.get_and_clear_pending_msg_events().remove(0));
10491049
nodes[1].node.handle_update_add_htlc(node_a_id, &send_event.msgs[0]);
1050-
commitment_signed_dance!(nodes[1], nodes[0], send_event.commitment_msg, false, true);
1050+
do_commitment_signed_dance(&nodes[1], &nodes[0], &send_event.commitment_msg, false, true);
10511051
check_added_monitors!(nodes[1], 0);
10521052

10531053
// Call forward_pending_htlcs and check that the new HTLC was simply added to the holding cell
@@ -1874,7 +1874,7 @@ fn test_monitor_update_fail_claim() {
18741874
nodes[1].node.handle_update_add_htlc(node_c_id, &payment_event.msgs[0]);
18751875
let events = nodes[1].node.get_and_clear_pending_msg_events();
18761876
assert_eq!(events.len(), 0);
1877-
commitment_signed_dance!(nodes[1], nodes[2], payment_event.commitment_msg, false, true);
1877+
do_commitment_signed_dance(&nodes[1], &nodes[2], &payment_event.commitment_msg, false, true);
18781878
expect_htlc_failure_conditions(nodes[1].node.get_and_clear_pending_events(), &[]);
18791879

18801880
let (_, payment_hash_3, payment_secret_3) = get_payment_preimage_hash!(nodes[0]);
@@ -1889,7 +1889,7 @@ fn test_monitor_update_fail_claim() {
18891889
nodes[1].node.handle_update_add_htlc(node_c_id, &payment_event.msgs[0]);
18901890
let events = nodes[1].node.get_and_clear_pending_msg_events();
18911891
assert_eq!(events.len(), 0);
1892-
commitment_signed_dance!(nodes[1], nodes[2], payment_event.commitment_msg, false, true);
1892+
do_commitment_signed_dance(&nodes[1], &nodes[2], &payment_event.commitment_msg, false, true);
18931893

18941894
// Now restore monitor updating on the 0<->1 channel and claim the funds on B.
18951895
let channel_id = chan_1.2;
@@ -1998,7 +1998,7 @@ fn test_monitor_update_on_pending_forwards() {
19981998

19991999
let cs_fail_update = get_htlc_update_msgs!(nodes[2], node_b_id);
20002000
nodes[1].node.handle_update_fail_htlc(node_c_id, &cs_fail_update.update_fail_htlcs[0]);
2001-
commitment_signed_dance!(nodes[1], nodes[2], cs_fail_update.commitment_signed, true, true);
2001+
do_commitment_signed_dance(&nodes[1], &nodes[2], &cs_fail_update.commitment_signed, true, true);
20022002
assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
20032003

20042004
let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
@@ -2029,7 +2029,7 @@ fn test_monitor_update_on_pending_forwards() {
20292029
let bs_updates = get_htlc_update_msgs!(nodes[1], node_a_id);
20302030
nodes[0].node.handle_update_fail_htlc(node_b_id, &bs_updates.update_fail_htlcs[0]);
20312031
nodes[0].node.handle_update_add_htlc(node_b_id, &bs_updates.update_add_htlcs[0]);
2032-
commitment_signed_dance!(nodes[0], nodes[1], bs_updates.commitment_signed, false, true);
2032+
do_commitment_signed_dance(&nodes[0], &nodes[1], &bs_updates.commitment_signed, false, true);
20332033

20342034
let events = nodes[0].node.get_and_clear_pending_events();
20352035
assert_eq!(events.len(), 2);
@@ -2525,7 +2525,7 @@ fn test_fail_htlc_on_broadcast_after_claim() {
25252525

25262526
nodes[0].node.handle_update_fulfill_htlc(node_b_id, bs_updates.update_fulfill_htlcs.remove(0));
25272527
expect_payment_sent(&nodes[0], payment_preimage, None, false, false);
2528-
commitment_signed_dance!(nodes[0], nodes[1], bs_updates.commitment_signed, true, true);
2528+
do_commitment_signed_dance(&nodes[0], &nodes[1], &bs_updates.commitment_signed, true, true);
25292529
expect_payment_path_successful!(nodes[0]);
25302530
}
25312531

‎lightning/src/ln/channelmanager.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18566,7 +18566,7 @@ mod tests {
1856618566
assert!(updates.update_fail_malformed_htlcs.is_empty());
1856718567
assert!(updates.update_fee.is_none());
1856818568
nodes[0].node.handle_update_fail_htlc(nodes[1].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
18569-
commitment_signed_dance!(nodes[0], nodes[1], updates.commitment_signed, true, true);
18569+
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, true, true);
1857018570
expect_payment_failed!(nodes[0], our_payment_hash, true);
1857118571

1857218572
// Send the second half of the original MPP payment.
@@ -18686,7 +18686,7 @@ mod tests {
1868618686
assert!(updates.update_fail_malformed_htlcs.is_empty());
1868718687
assert!(updates.update_fee.is_none());
1868818688
nodes[0].node.handle_update_fail_htlc(nodes[1].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
18689-
commitment_signed_dance!(nodes[0], nodes[1], updates.commitment_signed, true, true);
18689+
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, true, true);
1869018690
expect_payment_failed!(nodes[0], payment_hash, true);
1869118691

1869218692
// Finally, claim the original payment.
@@ -18733,7 +18733,7 @@ mod tests {
1873318733
assert!(updates.update_fail_malformed_htlcs.is_empty());
1873418734
assert!(updates.update_fee.is_none());
1873518735
nodes[0].node.handle_update_fail_htlc(nodes[1].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
18736-
commitment_signed_dance!(nodes[0], nodes[1], updates.commitment_signed, true, true);
18736+
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, true, true);
1873718737
expect_payment_failed!(nodes[0], payment_hash, true);
1873818738

1873918739
// Finally, succeed the keysend payment.
@@ -18782,7 +18782,7 @@ mod tests {
1878218782
assert!(updates.update_fail_malformed_htlcs.is_empty());
1878318783
assert!(updates.update_fee.is_none());
1878418784
nodes[0].node.handle_update_fail_htlc(nodes[1].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
18785-
commitment_signed_dance!(nodes[0], nodes[1], updates.commitment_signed, true, true);
18785+
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, true, true);
1878618786
expect_payment_failed!(nodes[0], payment_hash, true);
1878718787

1878818788
// Finally, claim the original payment.

‎lightning/src/ln/functional_test_utils.rs‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2644,15 +2644,6 @@ pub fn expect_htlc_forwarding_fails(
26442644
/// Performs the "commitment signed dance" - the series of message exchanges which occur after a
26452645
/// commitment update.
26462646
macro_rules! commitment_signed_dance {
2647-
($node_a: expr, $node_b: expr, $commitment_signed: expr, $fail_backwards: expr, true /* skip last step */) => {
2648-
$crate::ln::functional_test_utils::do_commitment_signed_dance(
2649-
&$node_a,
2650-
&$node_b,
2651-
&$commitment_signed,
2652-
$fail_backwards,
2653-
true,
2654-
);
2655-
};
26562647
($node_a: expr, $node_b: expr, (), $fail_backwards: expr, true /* skip last step */, true /* return extra message */, true /* return last RAA */) => {
26572648
$crate::ln::functional_test_utils::do_main_commitment_signed_dance(
26582649
&$node_a,
@@ -3597,7 +3588,7 @@ pub fn do_pass_along_path<'a, 'b, 'c>(args: PassAlongPathArgs) -> Option<Event>
35973588
check_added_monitors!(node, 0);
35983589

35993590
if is_last_hop && is_probe {
3600-
commitment_signed_dance!(node, prev_node, payment_event.commitment_msg, true, true);
3591+
do_commitment_signed_dance(node, prev_node, &payment_event.commitment_msg, true, true);
36013592
node.node.process_pending_htlc_forwards();
36023593
check_added_monitors(node, 1);
36033594
} else {

‎lightning/src/ln/functional_tests.rs‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1857,7 +1857,7 @@ pub fn test_simple_commitment_revoked_fail_backward() {
18571857
assert_eq!(node_a_id, *node_id);
18581858

18591859
nodes[0].node.handle_update_fail_htlc(node_b_id, &update_fail_htlcs[0]);
1860-
commitment_signed_dance!(nodes[0], nodes[1], commitment_signed, false, true);
1860+
do_commitment_signed_dance(&nodes[0], &nodes[1], commitment_signed, false, true);
18611861
let scid = chan_2.0.contents.short_channel_id;
18621862
expect_payment_failed_with_update!(nodes[0], payment_hash, false, scid, true);
18631863
},
@@ -2105,7 +2105,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(
21052105
nodes[0].node.handle_update_fail_htlc(node_b_id, &update_fail_htlcs[1]);
21062106
nodes[0].node.handle_update_fail_htlc(node_b_id, &update_fail_htlcs[2]);
21072107

2108-
commitment_signed_dance!(nodes[0], nodes[1], commitment_signed, false, true);
2108+
do_commitment_signed_dance(&nodes[0], &nodes[1], commitment_signed, false, true);
21092109

21102110
let events = nodes[0].node.get_and_clear_pending_events();
21112111
assert_eq!(events.len(), 6);
@@ -3399,7 +3399,7 @@ fn do_test_holding_cell_htlc_add_timeouts(forwarded_htlc: bool) {
33993399
..
34003400
} => {
34013401
nodes[0].node.handle_update_fail_htlc(node_b_id, &update_fail_htlcs[0]);
3402-
commitment_signed_dance!(nodes[0], nodes[1], commitment_signed, true, true);
3402+
do_commitment_signed_dance(&nodes[0], &nodes[1], commitment_signed, true, true);
34033403
},
34043404
_ => unreachable!(),
34053405
}
@@ -4192,7 +4192,7 @@ pub fn test_duplicate_payment_hash_one_failure_one_success() {
41924192

41934193
nodes[0].node.handle_update_fail_htlc(node_b_id, &htlc_updates.update_fail_htlcs[0]);
41944194
assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
4195-
commitment_signed_dance!(nodes[0], nodes[1], &htlc_updates.commitment_signed, false, true);
4195+
do_commitment_signed_dance(&nodes[0], &nodes[1], &htlc_updates.commitment_signed, false, true);
41964196
let failing_scid = chan_2.0.contents.short_channel_id;
41974197
expect_payment_failed_with_update!(nodes[0], dup_payment_hash, false, failing_scid, true);
41984198

@@ -4582,7 +4582,8 @@ fn do_test_fail_backwards_unrevoked_remote_announce(deliver_last_raa: bool, anno
45824582
.handle_update_fail_htlc(node_c_id, &updates.update_fail_htlcs[4]);
45834583
}
45844584
}
4585-
commitment_signed_dance!(target, nodes[2], updates.commitment_signed, false, true);
4585+
let commitment = &updates.commitment_signed;
4586+
do_commitment_signed_dance(target, &nodes[2], commitment, false, true);
45864587
},
45874588
_ => panic!("Unexpected event"),
45884589
}
@@ -5314,7 +5315,7 @@ pub fn test_free_and_fail_holding_cell_htlcs() {
53145315

53155316
let mut update_msgs = get_htlc_update_msgs!(nodes[1], node_a_id);
53165317
nodes[0].node.handle_update_fulfill_htlc(node_b_id, update_msgs.update_fulfill_htlcs.remove(0));
5317-
commitment_signed_dance!(nodes[0], nodes[1], update_msgs.commitment_signed, false, true);
5318+
do_commitment_signed_dance(&nodes[0], &nodes[1], &update_msgs.commitment_signed, false, true);
53185319
expect_payment_sent!(nodes[0], payment_preimage_1);
53195320
}
53205321

@@ -5506,7 +5507,7 @@ pub fn test_update_fulfill_htlc_bolt2_after_malformed_htlc_message_must_forward_
55065507
payment_event.msgs[0].onion_routing_packet.version = 1; //Produce a malformed HTLC message
55075508
nodes[2].node.handle_update_add_htlc(node_b_id, &payment_event.msgs[0]);
55085509
check_added_monitors(&nodes[2], 0);
5509-
commitment_signed_dance!(nodes[2], nodes[1], payment_event.commitment_msg, false, true);
5510+
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event.commitment_msg, false, true);
55105511
expect_and_process_pending_htlcs(&nodes[2], false);
55115512
expect_htlc_handling_failed_destinations!(
55125513
nodes[2].node.get_and_clear_pending_events(),
@@ -5544,7 +5545,7 @@ pub fn test_update_fulfill_htlc_bolt2_after_malformed_htlc_message_must_forward_
55445545
nodes[1].node.handle_update_fail_malformed_htlc(node_c_id, &update_msg.0);
55455546

55465547
check_added_monitors(&nodes[1], 0);
5547-
commitment_signed_dance!(nodes[1], nodes[2], update_msg.1, false, true);
5548+
do_commitment_signed_dance(&nodes[1], &nodes[2], &update_msg.1, false, true);
55485549
expect_and_process_pending_htlcs_and_htlc_handling_failed(
55495550
&nodes[1],
55505551
&[HTLCHandlingFailureType::Forward { node_id: Some(node_c_id), channel_id: chan_2.2 }],
@@ -5615,7 +5616,7 @@ pub fn test_channel_failed_after_message_with_badonion_node_perm_bits_set() {
56155616
payment_event.msgs[0].onion_routing_packet.version = 1; // Trigger an invalid_onion_version error
56165617
nodes[2].node.handle_update_add_htlc(node_b_id, &payment_event.msgs[0]);
56175618
check_added_monitors(&nodes[2], 0);
5618-
commitment_signed_dance!(nodes[2], nodes[1], payment_event.commitment_msg, false, true);
5619+
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event.commitment_msg, false, true);
56195620
expect_and_process_pending_htlcs(&nodes[2], false);
56205621
expect_htlc_handling_failed_destinations!(
56215622
nodes[2].node.get_and_clear_pending_events(),
@@ -5632,7 +5633,8 @@ pub fn test_channel_failed_after_message_with_badonion_node_perm_bits_set() {
56325633
update_msg.failure_code |= 0x2000;
56335634

56345635
nodes[1].node.handle_update_fail_malformed_htlc(node_c_id, &update_msg);
5635-
commitment_signed_dance!(nodes[1], nodes[2], updates.commitment_signed, false, true);
5636+
let commitment = &updates.commitment_signed;
5637+
do_commitment_signed_dance(&nodes[1], &nodes[2], commitment, false, true);
56365638
},
56375639
_ => panic!("Unexpected event"),
56385640
}
@@ -5648,7 +5650,8 @@ pub fn test_channel_failed_after_message_with_badonion_node_perm_bits_set() {
56485650
match events_4[0] {
56495651
MessageSendEvent::UpdateHTLCs { ref updates, .. } => {
56505652
nodes[0].node.handle_update_fail_htlc(node_b_id, &updates.update_fail_htlcs[0]);
5651-
commitment_signed_dance!(nodes[0], nodes[1], updates.commitment_signed, false, true);
5653+
let commitment = &updates.commitment_signed;
5654+
do_commitment_signed_dance(&nodes[0], &nodes[1], commitment, false, true);
56525655
},
56535656
_ => panic!("Unexpected event"),
56545657
}
@@ -5988,7 +5991,7 @@ pub fn test_check_htlc_underpaying() {
59885991
check_added_monitors(&nodes[1], 1);
59895992

59905993
nodes[0].node.handle_update_fail_htlc(node_b_id, &update_fail_htlc);
5991-
commitment_signed_dance!(nodes[0], nodes[1], commitment_signed, false, true);
5994+
do_commitment_signed_dance(&nodes[0], &nodes[1], commitment_signed, false, true);
59925995

59935996
// 10_000 msat as u64, followed by a height of CHAN_CONFIRM_DEPTH as u32
59945997
let mut expected_failure_data = (10_000 as u64).to_be_bytes().to_vec();
@@ -8120,7 +8123,7 @@ fn do_test_tx_confirmed_skipping_blocks_immediate_broadcast(test_height_before_t
81208123
assert!(updates.update_fail_malformed_htlcs.is_empty());
81218124
assert!(updates.update_fee.is_none());
81228125
nodes[0].node.handle_update_fail_htlc(node_b_id, &updates.update_fail_htlcs[0]);
8123-
commitment_signed_dance!(nodes[0], nodes[1], updates.commitment_signed, true, true);
8126+
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, true, true);
81248127

81258128
let failed_scid = chan_announce.contents.short_channel_id;
81268129
expect_payment_failed_with_update!(nodes[0], payment_hash, false, failed_scid, true);
@@ -8374,7 +8377,7 @@ pub fn test_inconsistent_mpp_params() {
83748377

83758378
nodes[3].node.handle_update_add_htlc(node_c_id, &payment_event.msgs[0]);
83768379
check_added_monitors(&nodes[3], 0);
8377-
commitment_signed_dance!(nodes[3], nodes[2], payment_event.commitment_msg, true, true);
8380+
do_commitment_signed_dance(&nodes[3], &nodes[2], &payment_event.commitment_msg, true, true);
83788381

83798382
// At this point, nodes[3] should notice the two HTLCs don't contain the same total payment
83808383
// amount. It will assume the second is a privacy attack (no longer particularly relevant
@@ -9055,7 +9058,7 @@ pub fn test_nondust_htlc_excess_fees_are_dust() {
90559058
let send = SendEvent::from_node(&nodes[2]);
90569059

90579060
nodes[0].node.handle_update_add_htlc(node_c_id, &send.msgs[0]);
9058-
commitment_signed_dance!(nodes[0], nodes[2], send.commitment_msg, false, true);
9061+
do_commitment_signed_dance(&nodes[0], &nodes[2], &send.commitment_msg, false, true);
90599062

90609063
expect_and_process_pending_htlcs(&nodes[0], true);
90619064
check_added_monitors(&nodes[0], 1);
@@ -9361,7 +9364,8 @@ fn do_payment_with_custom_min_final_cltv_expiry(valid_delta: bool, use_user_hash
93619364

93629365
let fail_updates = get_htlc_update_msgs!(nodes[1], node_a_id);
93639366
nodes[0].node.handle_update_fail_htlc(node_b_id, &fail_updates.update_fail_htlcs[0]);
9364-
commitment_signed_dance!(nodes[0], nodes[1], fail_updates.commitment_signed, false, true);
9367+
let commitment = &fail_updates.commitment_signed;
9368+
do_commitment_signed_dance(&nodes[0], &nodes[1], commitment, false, true);
93659369

93669370
expect_payment_failed!(nodes[0], hash, true);
93679371
}

‎lightning/src/ln/htlc_reserve_unit_tests.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,8 @@ pub fn holding_cell_htlc_counting() {
685685

686686
let bs_fail_updates = get_htlc_update_msgs!(nodes[1], node_a_id);
687687
nodes[0].node.handle_update_fail_htlc(node_b_id, &bs_fail_updates.update_fail_htlcs[0]);
688-
commitment_signed_dance!(nodes[0], nodes[1], bs_fail_updates.commitment_signed, false, true);
688+
let commitment = &bs_fail_updates.commitment_signed;
689+
do_commitment_signed_dance(&nodes[0], &nodes[1], commitment, false, true);
689690

690691
let failing_scid = chan_2.0.contents.short_channel_id;
691692
expect_payment_failed_with_update!(nodes[0], payment_hash_2, false, failing_scid, false);
@@ -2072,7 +2073,7 @@ pub fn test_update_fulfill_htlc_bolt2_missing_badonion_bit_for_malformed_htlc_me
20722073

20732074
nodes[1].node.handle_update_add_htlc(node_a_id, &updates.update_add_htlcs[0]);
20742075
check_added_monitors(&nodes[1], 0);
2075-
commitment_signed_dance!(nodes[1], nodes[0], updates.commitment_signed, false, true);
2076+
do_commitment_signed_dance(&nodes[1], &nodes[0], &updates.commitment_signed, false, true);
20762077
expect_and_process_pending_htlcs(&nodes[1], false);
20772078
expect_htlc_handling_failed_destinations!(
20782079
nodes[1].node.get_and_clear_pending_events(),

‎lightning/src/ln/invoice_utils.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1324,7 +1324,8 @@ mod test {
13241324
nodes[fwd_idx]
13251325
.node
13261326
.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &send_event.msgs[0]);
1327-
commitment_signed_dance!(nodes[fwd_idx], nodes[0], &send_event.commitment_msg, false, true);
1327+
let commitment = &send_event.commitment_msg;
1328+
do_commitment_signed_dance(&nodes[fwd_idx], &nodes[0], commitment, false, true);
13281329

13291330
// Note that we have to "forward pending HTLCs" twice before we see the PaymentClaimable as
13301331
// this "emulates" the payment taking two hops, providing some privacy to make phantom node

0 commit comments

Comments
 (0)