Skip to content

Commit e7ce43e

Browse files
carlaKCcarlaKC
committed
ln/refactor: pass failure reason into do_commitment_signed_dance
In upcoming commits, we'll make stronger assertions about the type of failure that we're getting when we set fail_backwards. This will be different depending on the type of route we're using - blinded routes fail malformed onion blinded and regular routes just see a downstream failure. This refactor prepares for adding those assertions by threading a failure reason through. The commitment_signed_dance macro is not updated because it already has an invocation with 5 parameters.
1 parent ae178c9 commit e7ce43e

File tree

6 files changed

+64
-43
lines changed

6 files changed

+64
-43
lines changed

‎lightning/src/ln/async_payments_tests.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,21 @@ fn invalid_keysend_payment_secret() {
186186
nodes[1]
187187
.node
188188
.handle_update_fail_malformed_htlc(nodes[2].node.get_our_node_id(), update_malformed);
189-
do_commitment_signed_dance(&nodes[1], &nodes[2], &updates_2_1.commitment_signed, true, false);
189+
do_commitment_signed_dance(
190+
&nodes[1],
191+
&nodes[2],
192+
&updates_2_1.commitment_signed,
193+
Some(FailureType::Blinded),
194+
false,
195+
);
190196

191197
let updates_1_0 = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
192198
assert_eq!(updates_1_0.update_fail_htlcs.len(), 1);
193199
nodes[0].node.handle_update_fail_htlc(
194200
nodes[1].node.get_our_node_id(),
195201
&updates_1_0.update_fail_htlcs[0],
196202
);
197-
commitment_signed_dance!(&nodes[0], &nodes[1], &updates_1_0.commitment_signed, false, false);
203+
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates_1_0.commitment_signed, None, false);
198204
expect_payment_failed_conditions(
199205
&nodes[0],
200206
payment_hash,

‎lightning/src/ln/blinded_payment_tests.rs‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ pub fn fail_blinded_htlc_backwards(
128128
nodes[i-1].node.handle_update_fail_htlc(
129129
nodes[i].node.get_our_node_id(), &unblinded_node_updates.update_fail_htlcs[i-1]
130130
);
131-
do_commitment_signed_dance(&nodes[i-1], &nodes[i], &unblinded_node_updates.commitment_signed, false, false);
131+
do_commitment_signed_dance(&nodes[i-1], &nodes[i], &unblinded_node_updates.commitment_signed, None, false);
132132
},
133133
_ => {
134134
let blinded_node_updates = get_htlc_update_msgs!(nodes[i], nodes[i-1].node.get_our_node_id());
@@ -137,7 +137,7 @@ pub fn fail_blinded_htlc_backwards(
137137
assert_eq!(update_malformed.sha256_of_onion, [0; 32]);
138138
assert_eq!(update_malformed.failure_code, LocalHTLCFailureReason::InvalidOnionBlinding.failure_code());
139139
nodes[i-1].node.handle_update_fail_malformed_htlc(nodes[i].node.get_our_node_id(), update_malformed);
140-
do_commitment_signed_dance(&nodes[i-1], &nodes[i], &blinded_node_updates.commitment_signed, true, false);
140+
do_commitment_signed_dance(&nodes[i-1], &nodes[i], &blinded_node_updates.commitment_signed, Some(FailureType::Blinded), false);
141141
}
142142
}
143143
}
@@ -414,15 +414,15 @@ fn do_forward_checks_failure(check: ForwardCheckFail, intro_fails: bool) {
414414

415415
nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &update_add);
416416
check_added_monitors!(nodes[1], 0);
417-
do_commitment_signed_dance(&nodes[1], &nodes[0], &updates_0_1.commitment_signed, true, true);
417+
do_commitment_signed_dance(&nodes[1], &nodes[0], &updates_0_1.commitment_signed, Some(FailureType::Blinded), true);
418418

419419
expect_pending_htlcs_forwardable!(nodes[1]);
420420
check_added_monitors!(nodes[1], 1);
421421

422422
if intro_fails {
423423
let mut updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
424424
nodes[0].node.handle_update_fail_htlc(nodes[1].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
425-
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, false, false);
425+
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, None, false);
426426
let failed_destination = match check {
427427
ForwardCheckFail::InboundOnionCheck => HTLCDestination::InvalidOnion,
428428
ForwardCheckFail::ForwardPayloadEncodedAsReceive => HTLCDestination::InvalidOnion,
@@ -452,7 +452,7 @@ fn do_forward_checks_failure(check: ForwardCheckFail, intro_fails: bool) {
452452

453453
nodes[2].node.handle_update_add_htlc(nodes[1].node.get_our_node_id(), &update_add);
454454
check_added_monitors!(nodes[2], 0);
455-
do_commitment_signed_dance(&nodes[2], &nodes[1], &updates_1_2.commitment_signed, true, true);
455+
do_commitment_signed_dance(&nodes[2], &nodes[1], &updates_1_2.commitment_signed, Some(FailureType::Blinded), true);
456456

457457
expect_pending_htlcs_forwardable!(nodes[2]);
458458
let failed_destination = match check {
@@ -474,11 +474,11 @@ fn do_forward_checks_failure(check: ForwardCheckFail, intro_fails: bool) {
474474
update_malformed.sha256_of_onion = [1; 32];
475475
update_malformed.failure_code = LocalHTLCFailureReason::InvalidOnionBlinding.failure_code() ^ 1;
476476
nodes[1].node.handle_update_fail_malformed_htlc(nodes[2].node.get_our_node_id(), update_malformed);
477-
do_commitment_signed_dance(&nodes[1], &nodes[2], &updates.commitment_signed, true, false);
477+
do_commitment_signed_dance(&nodes[1], &nodes[2], &updates.commitment_signed, Some(FailureType::Blinded), false);
478478

479479
let mut updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
480480
nodes[0].node.handle_update_fail_htlc(nodes[1].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
481-
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, false, false);
481+
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, None, false);
482482
expect_payment_failed_conditions(&nodes[0], payment_hash, false,
483483
PaymentFailedConditions::new().expected_htlc_error_data(LocalHTLCFailureReason::InvalidOnionBlinding, &[0; 32]));
484484
}
@@ -510,7 +510,7 @@ fn failed_backwards_to_intro_node() {
510510

511511
nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
512512
check_added_monitors!(nodes[1], 0);
513-
do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event.commitment_msg, false, false);
513+
do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event.commitment_msg, None, false);
514514
expect_pending_htlcs_forwardable!(nodes[1]);
515515
check_added_monitors!(&nodes[1], 1);
516516

@@ -523,7 +523,7 @@ fn failed_backwards_to_intro_node() {
523523
payment_event.msgs[0].onion_routing_packet.hop_data[0] ^= 1;
524524
nodes[2].node.handle_update_add_htlc(nodes[1].node.get_our_node_id(), &payment_event.msgs[0]);
525525
check_added_monitors!(nodes[2], 0);
526-
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event.commitment_msg, true, true);
526+
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event.commitment_msg, Some(FailureType::Blinded), true);
527527

528528
expect_pending_htlcs_forwardable!(nodes[2]);
529529
expect_htlc_handling_failed_destinations!(nodes[2].node.get_and_clear_pending_events(), &[HTLCDestination::InvalidOnion]);
@@ -539,11 +539,11 @@ fn failed_backwards_to_intro_node() {
539539
// converts it to the correct error.
540540
update_malformed.sha256_of_onion = [1; 32];
541541
nodes[1].node.handle_update_fail_malformed_htlc(nodes[2].node.get_our_node_id(), update_malformed);
542-
do_commitment_signed_dance(&nodes[1], &nodes[2], &updates.commitment_signed, true, false);
542+
do_commitment_signed_dance(&nodes[1], &nodes[2], &updates.commitment_signed, Some(FailureType::Blinded), false);
543543

544544
let mut updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
545545
nodes[0].node.handle_update_fail_htlc(nodes[1].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
546-
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, false, false);
546+
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, None, false);
547547
expect_payment_failed_conditions(&nodes[0], payment_hash, false,
548548
PaymentFailedConditions::new().expected_htlc_error_data(LocalHTLCFailureReason::InvalidOnionBlinding, &[0; 32]));
549549
}
@@ -594,7 +594,7 @@ fn do_forward_fail_in_process_pending_htlc_fwds(check: ProcessPendingHTLCsCheck,
594594

595595
nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
596596
check_added_monitors!(nodes[1], 0);
597-
do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event.commitment_msg, false, false);
597+
do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event.commitment_msg, None, false);
598598

599599
macro_rules! cause_error {
600600
($prev_node: expr, $curr_node: expr, $next_node: expr, $failed_chan_id: expr, $failed_scid: expr) => {
@@ -646,7 +646,7 @@ fn do_forward_fail_in_process_pending_htlc_fwds(check: ProcessPendingHTLCsCheck,
646646
let mut update_add = &mut updates_1_2.update_add_htlcs[0];
647647
nodes[2].node.handle_update_add_htlc(nodes[1].node.get_our_node_id(), &update_add);
648648
check_added_monitors!(nodes[2], 0);
649-
do_commitment_signed_dance(&nodes[2], &nodes[1], &updates_1_2.commitment_signed, true, true);
649+
do_commitment_signed_dance(&nodes[2], &nodes[1], &updates_1_2.commitment_signed, Some(FailureType::Blinded), true);
650650

651651
cause_error!(nodes[1], nodes[2], nodes[3], chan_id_2_3, chan_upd_2_3.short_channel_id);
652652
check_added_monitors!(nodes[2], 1);
@@ -660,11 +660,11 @@ fn do_forward_fail_in_process_pending_htlc_fwds(check: ProcessPendingHTLCsCheck,
660660
update_malformed.sha256_of_onion = [1; 32];
661661
update_malformed.failure_code = LocalHTLCFailureReason::InvalidOnionBlinding.failure_code() ^ 1;
662662
nodes[1].node.handle_update_fail_malformed_htlc(nodes[2].node.get_our_node_id(), update_malformed);
663-
do_commitment_signed_dance(&nodes[1], &nodes[2], &updates.commitment_signed, true, false);
663+
do_commitment_signed_dance(&nodes[1], &nodes[2], &updates.commitment_signed, Some(FailureType::Blinded), false);
664664

665665
let mut updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
666666
nodes[0].node.handle_update_fail_htlc(nodes[1].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
667-
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, false, false);
667+
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, None, false);
668668
expect_payment_failed_conditions(&nodes[0], payment_hash, false,
669669
PaymentFailedConditions::new().expected_htlc_error_data(LocalHTLCFailureReason::InvalidOnionBlinding, &[0; 32]));
670670
}
@@ -934,7 +934,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
934934
};
935935
nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &payment_event_0_1.msgs[0]);
936936
check_added_monitors!(nodes[1], 0);
937-
do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event_0_1.commitment_msg, false, false);
937+
do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event_0_1.commitment_msg, None, false);
938938
expect_pending_htlcs_forwardable!(nodes[1]);
939939
check_added_monitors!(&nodes[1], 1);
940940

@@ -949,7 +949,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
949949
ReceiveCheckFail::RecipientFail => {
950950
nodes[2].node.handle_update_add_htlc(nodes[1].node.get_our_node_id(), &payment_event_1_2.msgs[0]);
951951
check_added_monitors!(nodes[2], 0);
952-
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event_1_2.commitment_msg, true, true);
952+
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event_1_2.commitment_msg, Some(FailureType::Blinded), true);
953953
expect_pending_htlcs_forwardable!(nodes[2]);
954954
check_payment_claimable(
955955
&nodes[2].node.get_and_clear_pending_events()[0], payment_hash, payment_secret, amt_msat,
@@ -985,7 +985,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
985985
).unwrap();
986986
nodes[2].node.handle_update_add_htlc(nodes[1].node.get_our_node_id(), update_add);
987987
check_added_monitors!(nodes[2], 0);
988-
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event_1_2.commitment_msg, true, true);
988+
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event_1_2.commitment_msg, Some(FailureType::Blinded), true);
989989
expect_pending_htlcs_forwardable!(nodes[2]);
990990
expect_htlc_handling_failed_destinations!(nodes[2].node.get_and_clear_pending_events(), &[HTLCDestination::InvalidOnion]);
991991
check_added_monitors(&nodes[2], 1);
@@ -995,7 +995,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
995995
update_add.amount_msat -= 1;
996996
nodes[2].node.handle_update_add_htlc(nodes[1].node.get_our_node_id(), update_add);
997997
check_added_monitors!(nodes[2], 0);
998-
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event_1_2.commitment_msg, true, true);
998+
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event_1_2.commitment_msg, Some(FailureType::Blinded), true);
999999
expect_pending_htlcs_forwardable!(nodes[2]);
10001000
expect_htlc_handling_failed_destinations!(nodes[2].node.get_and_clear_pending_events(), &[HTLCDestination::FailedPayment { payment_hash }]);
10011001
check_added_monitors(&nodes[2], 1);
@@ -1020,7 +1020,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
10201020
assert_eq!(payment_event_1_2.msgs[0].cltv_expiry, nodes[0].best_block_info().1 + 1 + excess_final_cltv_delta_opt.unwrap() as u32 + TEST_FINAL_CLTV);
10211021
nodes[2].node.handle_update_add_htlc(nodes[1].node.get_our_node_id(), &payment_event_1_2.msgs[0]);
10221022
check_added_monitors!(nodes[2], 0);
1023-
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event_1_2.commitment_msg, true, true);
1023+
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event_1_2.commitment_msg, Some(FailureType::Blinded), true);
10241024
expect_pending_htlcs_forwardable!(nodes[2]);
10251025
expect_pending_htlcs_forwardable_and_htlc_handling_failed_ignore!(nodes[2],
10261026
vec![HTLCDestination::FailedPayment { payment_hash }]);
@@ -1029,7 +1029,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
10291029
ReceiveCheckFail::PaymentConstraints => {
10301030
nodes[2].node.handle_update_add_htlc(nodes[1].node.get_our_node_id(), &payment_event_1_2.msgs[0]);
10311031
check_added_monitors!(nodes[2], 0);
1032-
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event_1_2.commitment_msg, true, true);
1032+
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event_1_2.commitment_msg, Some(FailureType::Blinded), true);
10331033
expect_pending_htlcs_forwardable!(nodes[2]);
10341034
expect_htlc_handling_failed_destinations!(nodes[2].node.get_and_clear_pending_events(), &[HTLCDestination::FailedPayment { payment_hash }]);
10351035
check_added_monitors(&nodes[2], 1);
@@ -1042,7 +1042,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
10421042
assert_eq!(update_malformed.sha256_of_onion, [0; 32]);
10431043
assert_eq!(update_malformed.failure_code, LocalHTLCFailureReason::InvalidOnionBlinding.failure_code());
10441044
nodes[1].node.handle_update_fail_malformed_htlc(nodes[2].node.get_our_node_id(), update_malformed);
1045-
do_commitment_signed_dance(&nodes[1], &nodes[2], &updates_2_1.commitment_signed, true, false);
1045+
do_commitment_signed_dance(&nodes[1], &nodes[2], &updates_2_1.commitment_signed, Some(FailureType::Blinded), false);
10461046

10471047
let updates_1_0 = if check == ReceiveCheckFail::ChannelCheck {
10481048
let events = nodes[1].node.get_and_clear_pending_msg_events();
@@ -1060,7 +1060,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
10601060
} else { get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id()) };
10611061
assert_eq!(updates_1_0.update_fail_htlcs.len(), 1);
10621062
nodes[0].node.handle_update_fail_htlc(nodes[1].node.get_our_node_id(), &updates_1_0.update_fail_htlcs[0]);
1063-
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates_1_0.commitment_signed, false, false);
1063+
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates_1_0.commitment_signed, None, false);
10641064
expect_payment_failed_conditions(&nodes[0], payment_hash, false,
10651065
PaymentFailedConditions::new().expected_htlc_error_data(LocalHTLCFailureReason::InvalidOnionBlinding, &[0; 32]));
10661066
}
@@ -1131,12 +1131,12 @@ fn blinded_path_retries() {
11311131
assert_eq!(update_malformed.sha256_of_onion, [0; 32]);
11321132
assert_eq!(update_malformed.failure_code, LocalHTLCFailureReason::InvalidOnionBlinding.failure_code());
11331133
$intro_node.node.handle_update_fail_malformed_htlc(nodes[3].node.get_our_node_id(), update_malformed);
1134-
do_commitment_signed_dance(&$intro_node, &nodes[3], &updates.commitment_signed, true, false);
1134+
do_commitment_signed_dance(&$intro_node, &nodes[3], &updates.commitment_signed, Some(FailureType::Blinded), false);
11351135

11361136
let updates = get_htlc_update_msgs!($intro_node, nodes[0].node.get_our_node_id());
11371137
assert_eq!(updates.update_fail_htlcs.len(), 1);
11381138
nodes[0].node.handle_update_fail_htlc($intro_node.node.get_our_node_id(), &updates.update_fail_htlcs[0]);
1139-
do_commitment_signed_dance(&nodes[0], &$intro_node, &updates.commitment_signed, false, false);
1139+
do_commitment_signed_dance(&nodes[0], &$intro_node, &updates.commitment_signed, None, false);
11401140

11411141
let mut events = nodes[0].node.get_and_clear_pending_events();
11421142
assert_eq!(events.len(), 2);
@@ -1238,7 +1238,7 @@ fn min_htlc() {
12381238
};
12391239
nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &payment_event_0_1.msgs[0]);
12401240
check_added_monitors!(nodes[1], 0);
1241-
do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event_0_1.commitment_msg, true, true);
1241+
do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event_0_1.commitment_msg, Some(FailureType::Blinded), true);
12421242
expect_pending_htlcs_forwardable!(nodes[1]);
12431243
expect_htlc_handling_failed_destinations!(
12441244
nodes[1].node.get_and_clear_pending_events(),
@@ -1247,7 +1247,7 @@ fn min_htlc() {
12471247
check_added_monitors(&nodes[1], 1);
12481248
let mut updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
12491249
nodes[0].node.handle_update_fail_htlc(nodes[1].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
1250-
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, false, false);
1250+
do_commitment_signed_dance(&nodes[0], &nodes[1], &updates.commitment_signed, None, false);
12511251
expect_payment_failed_conditions(&nodes[0], payment_hash, false,
12521252
PaymentFailedConditions::new().expected_htlc_error_data(LocalHTLCFailureReason::InvalidOnionBlinding, &[0; 32]));
12531253
}
@@ -1431,7 +1431,7 @@ fn fails_receive_tlvs_authentication() {
14311431
let mut payment_event = SendEvent::from_event(ev);
14321432

14331433
nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
1434-
do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event.commitment_msg, true, true);
1434+
do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event.commitment_msg, Some(FailureType::Blinded), true);
14351435
expect_pending_htlcs_forwardable!(nodes[1]);
14361436
nodes[1].node.process_pending_htlc_forwards();
14371437
check_added_monitors!(nodes[1], 1);

‎lightning/src/ln/chanmon_update_fail_tests.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2955,7 +2955,7 @@ fn test_blocked_chan_preimage_release() {
29552955

29562956
let cs_htlc_fulfill_updates = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
29572957
nodes[1].node.handle_update_fulfill_htlc(nodes[2].node.get_our_node_id(), &cs_htlc_fulfill_updates.update_fulfill_htlcs[0]);
2958-
do_commitment_signed_dance(&nodes[1], &nodes[2], &cs_htlc_fulfill_updates.commitment_signed, false, false);
2958+
do_commitment_signed_dance(&nodes[1], &nodes[2], &cs_htlc_fulfill_updates.commitment_signed, None, false);
29592959
check_added_monitors(&nodes[1], 0);
29602960

29612961
// Now claim the second payment on nodes[0], which will ultimately result in nodes[1] trying to
@@ -2998,7 +2998,7 @@ fn test_blocked_chan_preimage_release() {
29982998
check_added_monitors(&nodes[1], 1);
29992999

30003000
nodes[2].node.handle_update_fulfill_htlc(nodes[1].node.get_our_node_id(), &bs_htlc_fulfill_updates.update_fulfill_htlcs[0]);
3001-
do_commitment_signed_dance(&nodes[2], &nodes[1], &bs_htlc_fulfill_updates.commitment_signed, false, false);
3001+
do_commitment_signed_dance(&nodes[2], &nodes[1], &bs_htlc_fulfill_updates.commitment_signed, None, false);
30023002
expect_payment_sent(&nodes[2], payment_preimage_2, None, true, true);
30033003
}
30043004

@@ -3153,7 +3153,7 @@ fn do_test_inverted_mon_completion_order(with_latest_manager: bool, complete_bc_
31533153
check_added_monitors(&nodes[1], 1);
31543154

31553155
nodes[0].node.handle_update_fulfill_htlc(nodes[1].node.get_our_node_id(), &bs_updates.update_fulfill_htlcs[0]);
3156-
do_commitment_signed_dance(&nodes[0], &nodes[1], &bs_updates.commitment_signed, false, false);
3156+
do_commitment_signed_dance(&nodes[0], &nodes[1], &bs_updates.commitment_signed, None, false);
31573157

31583158
expect_payment_forwarded!(nodes[1], &nodes[0], &nodes[2], Some(1_000), false, !with_latest_manager);
31593159

0 commit comments

Comments
 (0)