Skip to content

Commit ca485e1

Browse files
tnulltnull
committed
f Drop expect_pending_htlcs_forwardable 
1 parent f3511e7 commit ca485e1

17 files changed

+144
-156
lines changed

‎lightning-dns-resolver/src/lib.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,7 @@ mod test {
179179
use lightning::types::payment::PaymentHash;
180180
use lightning::util::logger::Logger;
181181

182-
use lightning::{
183-
commitment_signed_dance, expect_payment_claimed, expect_pending_htlcs_forwardable,
184-
get_htlc_update_msgs,
185-
};
182+
use lightning::{commitment_signed_dance, expect_payment_claimed, get_htlc_update_msgs};
186183
use lightning_types::string::UntrustedString;
187184

188185
use std::ops::Deref;
@@ -413,7 +410,7 @@ mod test {
413410
let updates = get_htlc_update_msgs!(nodes[0], payee_id);
414411
nodes[1].node.handle_update_add_htlc(payer_id, &updates.update_add_htlcs[0]);
415412
commitment_signed_dance!(nodes[1], nodes[0], updates.commitment_signed, false);
416-
expect_pending_htlcs_forwardable!(nodes[1]);
413+
nodes[1].node.process_pending_htlc_forwards();
417414

418415
let claimable_events = nodes[1].node.get_and_clear_pending_events();
419416
assert_eq!(claimable_events.len(), 1);

‎lightning/src/ln/async_signer_tests.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,7 @@ fn do_test_async_commitment_signature_ordering(monitor_update_failure: bool) {
956956
assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
957957
check_added_monitors!(nodes[0], 1);
958958

959-
expect_pending_htlcs_forwardable!(nodes[1]);
959+
nodes[1].node.process_pending_htlc_forwards();
960960

961961
let events_5 = nodes[1].node.get_and_clear_pending_events();
962962
check_payment_claimable(

‎lightning/src/ln/blinded_payment_tests.rs‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ fn do_forward_checks_failure(check: ForwardCheckFail, intro_fails: bool) {
439439
check_added_monitors!(nodes[1], 0);
440440
do_commitment_signed_dance(&nodes[1], &nodes[0], &updates_0_1.commitment_signed, true, true);
441441

442-
expect_pending_htlcs_forwardable!(nodes[1]);
442+
nodes[1].node.process_pending_htlc_forwards();
443443
check_added_monitors!(nodes[1], 1);
444444

445445
if intro_fails {
@@ -477,7 +477,7 @@ fn do_forward_checks_failure(check: ForwardCheckFail, intro_fails: bool) {
477477
check_added_monitors!(nodes[2], 0);
478478
do_commitment_signed_dance(&nodes[2], &nodes[1], &updates_1_2.commitment_signed, true, true);
479479

480-
expect_pending_htlcs_forwardable!(nodes[2]);
480+
nodes[2].node.process_pending_htlc_forwards();
481481
let failed_destination = match check {
482482
ForwardCheckFail::InboundOnionCheck|ForwardCheckFail::ForwardPayloadEncodedAsReceive => HTLCHandlingFailureType::InvalidOnion,
483483
ForwardCheckFail::OutboundChannelCheck =>
@@ -534,7 +534,7 @@ fn failed_backwards_to_intro_node() {
534534
nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
535535
check_added_monitors!(nodes[1], 0);
536536
do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event.commitment_msg, false, false);
537-
expect_pending_htlcs_forwardable!(nodes[1]);
537+
nodes[1].node.process_pending_htlc_forwards();
538538
check_added_monitors!(&nodes[1], 1);
539539

540540
let mut events = nodes[1].node.get_and_clear_pending_msg_events();
@@ -548,7 +548,7 @@ fn failed_backwards_to_intro_node() {
548548
check_added_monitors!(nodes[2], 0);
549549
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event.commitment_msg, true, true);
550550

551-
expect_pending_htlcs_forwardable!(nodes[2]);
551+
nodes[2].node.process_pending_htlc_forwards();
552552
expect_htlc_handling_failed_destinations!(nodes[2].node.get_and_clear_pending_events(), &[HTLCHandlingFailureType::InvalidOnion]);
553553
check_added_monitors(&nodes[2], 1);
554554

@@ -626,7 +626,7 @@ fn do_forward_fail_in_process_pending_htlc_fwds(check: ProcessPendingHTLCsCheck,
626626
// Disconnect the next-hop peer so when we go to forward in process_pending_htlc_forwards, the
627627
// intro node will error backwards.
628628
$curr_node.node.peer_disconnected($next_node.node.get_our_node_id());
629-
expect_pending_htlcs_forwardable!($curr_node);
629+
$curr_node.node.process_pending_htlc_forwards();
630630
expect_htlc_handling_failed_destinations!($curr_node.node.get_and_clear_pending_events(),
631631
vec![HTLCHandlingFailureType::Forward { node_id: Some($next_node.node.get_our_node_id()), channel_id: $failed_chan_id }]);
632632
},
@@ -658,7 +658,7 @@ fn do_forward_fail_in_process_pending_htlc_fwds(check: ProcessPendingHTLCsCheck,
658658
return
659659
}
660660

661-
expect_pending_htlcs_forwardable!(nodes[1]);
661+
nodes[1].node.process_pending_htlc_forwards();
662662
check_added_monitors!(nodes[1], 1);
663663

664664
let mut updates_1_2 = get_htlc_update_msgs!(nodes[1], nodes[2].node.get_our_node_id());
@@ -725,7 +725,7 @@ fn do_blinded_intercept_payment(intercept_node_fails: bool) {
725725
};
726726
nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
727727
commitment_signed_dance!(nodes[1], nodes[0], &payment_event.commitment_msg, false, true);
728-
expect_pending_htlcs_forwardable!(nodes[1]);
728+
nodes[1].node.process_pending_htlc_forwards();
729729

730730
let events = nodes[1].node.get_and_clear_pending_events();
731731
assert_eq!(events.len(), 1);
@@ -751,7 +751,7 @@ fn do_blinded_intercept_payment(intercept_node_fails: bool) {
751751
}
752752

753753
nodes[1].node.forward_intercepted_htlc(intercept_id, &channel_id, nodes[2].node.get_our_node_id(), expected_outbound_amount_msat).unwrap();
754-
expect_pending_htlcs_forwardable!(nodes[1]);
754+
nodes[1].node.process_pending_htlc_forwards();
755755

756756
let payment_event = {
757757
{
@@ -765,7 +765,7 @@ fn do_blinded_intercept_payment(intercept_node_fails: bool) {
765765
};
766766
nodes[2].node.handle_update_add_htlc(nodes[1].node.get_our_node_id(), &payment_event.msgs[0]);
767767
commitment_signed_dance!(nodes[2], nodes[1], &payment_event.commitment_msg, false, true);
768-
expect_pending_htlcs_forwardable!(nodes[2]);
768+
nodes[2].node.process_pending_htlc_forwards();
769769

770770
expect_payment_claimable!(&nodes[2], payment_hash, payment_secret, amt_msat, None, nodes[2].node.get_our_node_id());
771771
do_claim_payment_along_route(
@@ -954,7 +954,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
954954
nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &payment_event_0_1.msgs[0]);
955955
check_added_monitors!(nodes[1], 0);
956956
do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event_0_1.commitment_msg, false, false);
957-
expect_pending_htlcs_forwardable!(nodes[1]);
957+
nodes[1].node.process_pending_htlc_forwards();
958958
check_added_monitors!(&nodes[1], 1);
959959

960960
let mut payment_event_1_2 = {
@@ -969,7 +969,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
969969
nodes[2].node.handle_update_add_htlc(nodes[1].node.get_our_node_id(), &payment_event_1_2.msgs[0]);
970970
check_added_monitors!(nodes[2], 0);
971971
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event_1_2.commitment_msg, true, true);
972-
expect_pending_htlcs_forwardable!(nodes[2]);
972+
nodes[2].node.process_pending_htlc_forwards();
973973
check_payment_claimable(
974974
&nodes[2].node.get_and_clear_pending_events()[0], payment_hash, payment_secret, amt_msat,
975975
None, nodes[2].node.get_our_node_id()
@@ -1005,7 +1005,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
10051005
nodes[2].node.handle_update_add_htlc(nodes[1].node.get_our_node_id(), update_add);
10061006
check_added_monitors!(nodes[2], 0);
10071007
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event_1_2.commitment_msg, true, true);
1008-
expect_pending_htlcs_forwardable!(nodes[2]);
1008+
nodes[2].node.process_pending_htlc_forwards();
10091009
expect_htlc_handling_failed_destinations!(nodes[2].node.get_and_clear_pending_events(), &[HTLCHandlingFailureType::InvalidOnion]);
10101010
check_added_monitors(&nodes[2], 1);
10111011
},
@@ -1015,7 +1015,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
10151015
nodes[2].node.handle_update_add_htlc(nodes[1].node.get_our_node_id(), update_add);
10161016
check_added_monitors!(nodes[2], 0);
10171017
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event_1_2.commitment_msg, true, true);
1018-
expect_pending_htlcs_forwardable!(nodes[2]);
1018+
nodes[2].node.process_pending_htlc_forwards();
10191019
expect_htlc_handling_failed_destinations!(nodes[2].node.get_and_clear_pending_events(), &[HTLCHandlingFailureType::Receive { payment_hash }]);
10201020
check_added_monitors(&nodes[2], 1);
10211021
},
@@ -1031,7 +1031,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
10311031

10321032
nodes[2].node.handle_shutdown(nodes[1].node.get_our_node_id(), &node_1_shutdown);
10331033
commitment_signed_dance!(nodes[2], nodes[1], (), false, true, false, false);
1034-
expect_pending_htlcs_forwardable!(nodes[2]);
1034+
nodes[2].node.process_pending_htlc_forwards();
10351035
expect_htlc_handling_failed_destinations!(nodes[2].node.get_and_clear_pending_events(), &[HTLCHandlingFailureType::Receive { payment_hash }]);
10361036
check_added_monitors(&nodes[2], 1);
10371037
},
@@ -1040,7 +1040,8 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
10401040
nodes[2].node.handle_update_add_htlc(nodes[1].node.get_our_node_id(), &payment_event_1_2.msgs[0]);
10411041
check_added_monitors!(nodes[2], 0);
10421042
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event_1_2.commitment_msg, true, true);
1043-
expect_pending_htlcs_forwardable!(nodes[2]);
1043+
nodes[2].node.process_pending_htlc_forwards();
1044+
nodes[2].node.process_pending_htlc_forwards();
10441045
expect_pending_htlcs_forwardable_and_htlc_handling_failed_ignore!(nodes[2],
10451046
[HTLCHandlingFailureType::Receive { payment_hash }]);
10461047
check_added_monitors!(nodes[2], 1);
@@ -1049,7 +1050,7 @@ fn do_multi_hop_receiver_fail(check: ReceiveCheckFail) {
10491050
nodes[2].node.handle_update_add_htlc(nodes[1].node.get_our_node_id(), &payment_event_1_2.msgs[0]);
10501051
check_added_monitors!(nodes[2], 0);
10511052
do_commitment_signed_dance(&nodes[2], &nodes[1], &payment_event_1_2.commitment_msg, true, true);
1052-
expect_pending_htlcs_forwardable!(nodes[2]);
1053+
nodes[2].node.process_pending_htlc_forwards();
10531054
expect_htlc_handling_failed_destinations!(nodes[2].node.get_and_clear_pending_events(), &[HTLCHandlingFailureType::Receive { payment_hash }]);
10541055
check_added_monitors(&nodes[2], 1);
10551056
}
@@ -1254,7 +1255,7 @@ fn min_htlc() {
12541255
nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &payment_event_0_1.msgs[0]);
12551256
check_added_monitors!(nodes[1], 0);
12561257
do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event_0_1.commitment_msg, true, true);
1257-
expect_pending_htlcs_forwardable!(nodes[1]);
1258+
nodes[1].node.process_pending_htlc_forwards();
12581259
expect_htlc_handling_failed_destinations!(
12591260
nodes[1].node.get_and_clear_pending_events(),
12601261
&[HTLCHandlingFailureType::Forward { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_1_2.2 }]
@@ -1447,7 +1448,7 @@ fn fails_receive_tlvs_authentication() {
14471448

14481449
nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
14491450
do_commitment_signed_dance(&nodes[1], &nodes[0], &payment_event.commitment_msg, true, true);
1450-
expect_pending_htlcs_forwardable!(nodes[1]);
1451+
nodes[1].node.process_pending_htlc_forwards();
14511452
nodes[1].node.process_pending_htlc_forwards();
14521453
check_added_monitors!(nodes[1], 1);
14531454
expect_htlc_handling_failed_destinations!(nodes[1].node.get_and_clear_pending_events(), &[HTLCHandlingFailureType::InvalidOnion]);

‎lightning/src/ln/bolt11_payment_tests.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ fn payment_metadata_end_to_end_for_invoice_with_amount() {
7878
nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &send_event.msgs[0]);
7979
commitment_signed_dance!(nodes[1], nodes[0], &send_event.commitment_msg, false);
8080

81-
expect_pending_htlcs_forwardable!(nodes[1]);
81+
nodes[1].node.process_pending_htlc_forwards();
8282

8383
let mut events = nodes[1].node.get_and_clear_pending_events();
8484
assert_eq!(events.len(), 1);
@@ -146,7 +146,7 @@ fn payment_metadata_end_to_end_for_invoice_with_no_amount() {
146146
nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &send_event.msgs[0]);
147147
commitment_signed_dance!(nodes[1], nodes[0], &send_event.commitment_msg, false);
148148

149-
expect_pending_htlcs_forwardable!(nodes[1]);
149+
nodes[1].node.process_pending_htlc_forwards();
150150

151151
let mut events = nodes[1].node.get_and_clear_pending_events();
152152
assert_eq!(events.len(), 1);

0 commit comments

Comments
 (0)