Skip to content

Commit 286282e

Browse files
tnulltnull
committed
f Don't expose skimmed fee param in test macro
1 parent b6365a3 commit 286282e

7 files changed

+29
-29
lines changed

‎lightning/src/ln/chanmon_update_fail_tests.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
//! here. See also the chanmon_fail_consistency fuzz test.
1414
1515
use bitcoin::blockdata::constants::genesis_block;
16-
use bitcoin::hash_types::BlockHash;
17-
use bitcoin::network::constants::Network;
16+
use bitcoin::hash_types::BlockHash; use bitcoin::network::constants::Network;
1817
use crate::chain::channelmonitor::{ANTI_REORG_DELAY, ChannelMonitor};
1918
use crate::chain::transaction::OutPoint;
2019
use crate::chain::{ChannelMonitorUpdateStatus, Listen, Watch};
@@ -1107,7 +1106,7 @@ fn test_monitor_update_fail_reestablish() {
11071106
assert!(updates.update_fee.is_none());
11081107
assert_eq!(updates.update_fulfill_htlcs.len(), 1);
11091108
nodes[1].node.handle_update_fulfill_htlc(&nodes[2].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
1110-
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), None, false, false);
1109+
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);
11111110
check_added_monitors!(nodes[1], 1);
11121111
assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
11131112
commitment_signed_dance!(nodes[1], nodes[2], updates.commitment_signed, false);
@@ -2153,7 +2152,7 @@ fn test_fail_htlc_on_broadcast_after_claim() {
21532152
nodes[1].node.handle_update_fulfill_htlc(&nodes[2].node.get_our_node_id(), &cs_updates.update_fulfill_htlcs[0]);
21542153
let bs_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
21552154
check_added_monitors!(nodes[1], 1);
2156-
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), None, false, false);
2155+
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);
21572156

21582157
mine_transaction(&nodes[1], &bs_txn[0]);
21592158
check_closed_event!(nodes[1], 1, ClosureReason::CommitmentTxConfirmed, [nodes[2].node.get_our_node_id()], 100000);
@@ -2526,7 +2525,7 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
25262525
assert_eq!(fulfill_msg, cs_updates.update_fulfill_htlcs[0]);
25272526
}
25282527
nodes[1].node.handle_update_fulfill_htlc(&nodes[2].node.get_our_node_id(), &fulfill_msg);
2529-
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), None, false, false);
2528+
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);
25302529
check_added_monitors!(nodes[1], 1);
25312530

25322531
let mut bs_updates = None;
@@ -3156,7 +3155,7 @@ fn do_test_inverted_mon_completion_order(with_latest_manager: bool, complete_bc_
31563155
nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.update_fulfill_htlcs[0]);
31573156
do_commitment_signed_dance(&nodes[0], &nodes[1], &bs_updates.commitment_signed, false, false);
31583157

3159-
expect_payment_forwarded!(nodes[1], &nodes[0], &nodes[2], Some(1_000), None, false, !with_latest_manager);
3158+
expect_payment_forwarded!(nodes[1], &nodes[0], &nodes[2], Some(1_000), false, !with_latest_manager);
31603159

31613160
// Finally, check that the payment was, ultimately, seen as sent by node A.
31623161
expect_payment_sent(&nodes[0], payment_preimage, None, true, true);
@@ -3287,7 +3286,7 @@ fn do_test_durable_preimages_on_closed_channel(close_chans_before_reload: bool,
32873286
} else {
32883287
// While we forwarded the payment a while ago, we don't want to process events too early or
32893288
// we'll run background tasks we wanted to test individually.
3290-
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], None, None, true, !close_only_a);
3289+
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], None, true, !close_only_a);
32913290
}
32923291

32933292
mine_transactions(&nodes[0], &[&as_closing_tx[0], bs_preimage_tx]);
@@ -3310,7 +3309,7 @@ fn do_test_durable_preimages_on_closed_channel(close_chans_before_reload: bool,
33103309
reconnect_nodes(reconnect_args);
33113310
let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
33123311
nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);
3313-
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), None, true, false);
3312+
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), true, false);
33143313
if !close_chans_before_reload {
33153314
// Once we call `process_pending_events` the final `ChannelMonitor` for the B<->C
33163315
// channel will fly, removing the payment preimage from it.
@@ -3404,7 +3403,8 @@ fn do_test_reload_mon_update_completion_actions(close_during_reload: bool) {
34043403
let bc_update_id = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_bc).unwrap().2;
34053404
let mut events = nodes[1].node.get_and_clear_pending_events();
34063405
assert_eq!(events.len(), if close_during_reload { 2 } else { 1 });
3407-
expect_payment_forwarded(events.pop().unwrap(), &nodes[1], &nodes[0], &nodes[2], Some(1000), None, close_during_reload, false);
3406+
expect_payment_forwarded(events.pop().unwrap(), &nodes[1], &nodes[0], &nodes[2], Some(1000),
3407+
None, close_during_reload, false);
34083408
if close_during_reload {
34093409
match events[0] {
34103410
Event::ChannelClosed { .. } => {},
@@ -3478,7 +3478,7 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
34783478
reconnect_nodes(reconnect);
34793479

34803480
if !hold_chan_a {
3481-
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), None, false, false);
3481+
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);
34823482
send_payment(&nodes[0], &[&nodes[1], &nodes[2]], 100_000);
34833483
} else {
34843484
assert!(nodes[1].node.get_and_clear_pending_events().is_empty());

‎lightning/src/ln/functional_test_utils.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -2230,14 +2230,12 @@ pub fn expect_payment_forwarded<CM: AChannelManager, H: NodeHolder<CM=CM>>(
22302230
}
22312231

22322232
macro_rules! expect_payment_forwarded {
2233-
($node: expr, $prev_node: expr, $next_node: expr, $expected_fee: expr,
2234-
$expected_extra_fee_limit_msat: expr, $upstream_force_closed: expr,
2235-
$downstream_force_closed: expr) => {
2233+
($node: expr, $prev_node: expr, $next_node: expr, $expected_fee: expr, $upstream_force_closed: expr, $downstream_force_closed: expr) => {
22362234
let mut events = $node.node.get_and_clear_pending_events();
22372235
assert_eq!(events.len(), 1);
2238-
$crate::ln::functional_test_utils::expect_payment_forwarded(
2239-
events.pop().unwrap(), &$node, &$prev_node, &$next_node, $expected_fee,
2240-
$expected_extra_fee_limit_msat, $upstream_force_closed, $downstream_force_closed);
2236+
$crate::ln::functional_test_utils::expect_payment_forwarded( events.pop().unwrap(), &$node,
2237+
&$prev_node, &$next_node, $expected_fee, None, $upstream_force_closed,
2238+
$downstream_force_closed);
22412239
}
22422240
}
22432241

@@ -2676,8 +2674,10 @@ pub fn pass_claimed_payment_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, '
26762674
fee += expected_extra_fees[i];
26772675
expected_extra_fee_limit = Some(expected_extra_fees[i] as u64);
26782676
}
2679-
expect_payment_forwarded!(*$node, $next_node, $prev_node, Some(fee as u64),
2680-
expected_extra_fee_limit, false, false);
2677+
let mut events = $node.node.get_and_clear_pending_events();
2678+
assert_eq!(events.len(), 1);
2679+
expect_payment_forwarded(events.pop().unwrap(), *$node, $next_node, $prev_node,
2680+
Some(fee as u64), expected_extra_fee_limit, false, false);
26812681
expected_total_fee_msat += fee as u64;
26822682
check_added_monitors!($node, 1);
26832683
let new_next_msgs = if $new_msgs {

‎lightning/src/ln/functional_tests.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5103,7 +5103,7 @@ fn test_duplicate_payment_hash_one_failure_one_success() {
51035103

51045104
// Solve 2nd HTLC by broadcasting on B's chain HTLC-Success Tx from C
51055105
mine_transaction(&nodes[1], &htlc_success_txn[1]);
5106-
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(196), None, true, true);
5106+
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(196), true, true);
51075107
let updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
51085108
assert!(updates.update_add_htlcs.is_empty());
51095109
assert!(updates.update_fail_htlcs.is_empty());
@@ -8825,7 +8825,7 @@ fn do_test_onchain_htlc_settlement_after_close(broadcast_alice: bool, go_onchain
88258825

88268826
nodes[1].node.handle_update_fulfill_htlc(&nodes[2].node.get_our_node_id(), &carol_updates.update_fulfill_htlcs[0]);
88278827
let went_onchain = go_onchain_before_fulfill || force_closing_node == 1;
8828-
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], if went_onchain { None } else { Some(1000) }, None, went_onchain, false);
8828+
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], if went_onchain { None } else { Some(1000) }, went_onchain, false);
88298829
// If Alice broadcasted but Bob doesn't know yet, here he prepares to tell her about the preimage.
88308830
if !go_onchain_before_fulfill && broadcast_alice {
88318831
let events = nodes[1].node.get_and_clear_pending_msg_events();

‎lightning/src/ln/payment_tests.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
737737
nodes[1].node.handle_update_fulfill_htlc(&nodes[2].node.get_our_node_id(), &htlc_fulfill_updates.update_fulfill_htlcs[0]);
738738
check_added_monitors!(nodes[1], 1);
739739
commitment_signed_dance!(nodes[1], nodes[2], htlc_fulfill_updates.commitment_signed, false);
740-
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], None, None, true, false);
740+
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], None, true, false);
741741

742742
if confirm_before_reload {
743743
let best_block = nodes[0].blocks.lock().unwrap().last().unwrap().clone();
@@ -3621,7 +3621,7 @@ fn do_claim_from_closed_chan(fail_payment: bool) {
36213621

36223622
mine_transactions(&nodes[1], &[&bs_tx[0], &ds_tx[0]]);
36233623
check_added_monitors(&nodes[1], 1);
3624-
expect_payment_forwarded!(nodes[1], nodes[0], nodes[3], Some(1000), None, false, true);
3624+
expect_payment_forwarded!(nodes[1], nodes[0], nodes[3], Some(1000), false, true);
36253625

36263626
let bs_claims = nodes[1].node.get_and_clear_pending_msg_events();
36273627
check_added_monitors(&nodes[1], 1);
@@ -3640,7 +3640,7 @@ fn do_claim_from_closed_chan(fail_payment: bool) {
36403640
let cs_claim_msgs = nodes[2].node.get_and_clear_pending_msg_events();
36413641
check_added_monitors(&nodes[2], 1);
36423642
commitment_signed_dance!(nodes[2], nodes[3], updates.commitment_signed, false, true);
3643-
expect_payment_forwarded!(nodes[2], nodes[0], nodes[3], Some(1000), None, false, false);
3643+
expect_payment_forwarded!(nodes[2], nodes[0], nodes[3], Some(1000), false, false);
36443644
cs_claim_msgs
36453645
} else { panic!(); };
36463646

‎lightning/src/ln/reload_tests.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ fn do_test_partial_claim_before_restart(persist_both_monitors: bool) {
928928
nodes[2].node.handle_update_fulfill_htlc(&nodes[3].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
929929
check_added_monitors!(nodes[2], 1);
930930
let cs_updates = get_htlc_update_msgs!(nodes[2], nodes[0].node.get_our_node_id());
931-
expect_payment_forwarded!(nodes[2], nodes[0], nodes[3], Some(1000), None, false, false);
931+
expect_payment_forwarded!(nodes[2], nodes[0], nodes[3], Some(1000), false, false);
932932
commitment_signed_dance!(nodes[2], nodes[3], updates.commitment_signed, false, true);
933933
cs_updates
934934
}
@@ -1078,7 +1078,7 @@ fn do_forwarded_payment_no_manager_persistence(use_cs_commitment: bool, claim_ht
10781078
if !claim_htlc {
10791079
expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], [HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
10801080
} else {
1081-
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), None, false, true);
1081+
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, true);
10821082
}
10831083
check_added_monitors!(nodes[1], 1);
10841084

‎lightning/src/ln/reorg_tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ fn do_test_onchain_htlc_reorg(local_commitment: bool, claim: bool) {
125125
// ChannelManager only polls chain::Watch::release_pending_monitor_events when we
126126
// probe it for events, so we probe non-message events here (which should just be the
127127
// PaymentForwarded event).
128-
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), None, true, true);
128+
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), true, true);
129129
} else {
130130
// Confirm the timeout tx and check that we fail the HTLC backwards
131131
connect_block(&nodes[1], &create_dummy_block(nodes[1].best_block_hash(), 42, Vec::new()));

‎lightning/src/ln/shutdown_tests.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ fn expect_channel_shutdown_state_with_htlc() {
165165
assert!(updates.update_fee.is_none());
166166
assert_eq!(updates.update_fulfill_htlcs.len(), 1);
167167
nodes[1].node.handle_update_fulfill_htlc(&nodes[2].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
168-
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), None, false, false);
168+
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);
169169
check_added_monitors!(nodes[1], 1);
170170
let updates_2 = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
171171
commitment_signed_dance!(nodes[1], nodes[2], updates.commitment_signed, false);
@@ -382,7 +382,7 @@ fn updates_shutdown_wait() {
382382
assert!(updates.update_fee.is_none());
383383
assert_eq!(updates.update_fulfill_htlcs.len(), 1);
384384
nodes[1].node.handle_update_fulfill_htlc(&nodes[2].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
385-
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), None, false, false);
385+
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);
386386
check_added_monitors!(nodes[1], 1);
387387
let updates_2 = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
388388
commitment_signed_dance!(nodes[1], nodes[2], updates.commitment_signed, false);
@@ -579,7 +579,7 @@ fn do_test_shutdown_rebroadcast(recv_count: u8) {
579579
assert!(updates.update_fee.is_none());
580580
assert_eq!(updates.update_fulfill_htlcs.len(), 1);
581581
nodes[1].node.handle_update_fulfill_htlc(&nodes[2].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
582-
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), None, false, false);
582+
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);
583583
check_added_monitors!(nodes[1], 1);
584584
let updates_2 = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
585585
commitment_signed_dance!(nodes[1], nodes[2], updates.commitment_signed, false);

0 commit comments

Comments
 (0)