Skip to content

Commit b5e05cd

Browse files
elnoshelnosh
committed
Remove check_added_monitors macro
Replace calls to `check_added_monitors` macro to the identically-named function.
1 parent ab900bd commit b5e05cd

23 files changed

+624
-638
lines changed

‎lightning-liquidity/tests/lsps2_integration_tests.rs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@ use common::{
77
get_lsps_message, LSPSNodes, LSPSNodesWithPayer, LiquidityNode,
88
};
99

10-
use lightning::check_added_monitors;
1110
use lightning::events::{ClosureReason, Event};
1211
use lightning::get_event_msg;
1312
use lightning::ln::channelmanager::PaymentId;
1413
use lightning::ln::channelmanager::Retry;
15-
use lightning::ln::functional_test_utils::create_funding_transaction;
1614
use lightning::ln::functional_test_utils::do_commitment_signed_dance;
1715
use lightning::ln::functional_test_utils::expect_channel_pending_event;
1816
use lightning::ln::functional_test_utils::expect_channel_ready_event;
1917
use lightning::ln::functional_test_utils::expect_payment_sent;
2018
use lightning::ln::functional_test_utils::test_default_channel_config;
2119
use lightning::ln::functional_test_utils::SendEvent;
20+
use lightning::ln::functional_test_utils::{check_added_monitors, create_funding_transaction};
2221
use lightning::ln::functional_test_utils::{connect_blocks, create_chan_between_nodes_with_value};
2322
use lightning::ln::msgs::BaseMessageHandler;
2423
use lightning::ln::msgs::ChannelMessageHandler;
@@ -1226,7 +1225,7 @@ fn client_trusts_lsp_end_to_end_test() {
12261225
)
12271226
.unwrap();
12281227

1229-
check_added_monitors!(payer_node, 1);
1228+
check_added_monitors(&payer_node, 1);
12301229
let events = payer_node.node.get_and_clear_pending_msg_events();
12311230
let ev = SendEvent::from_event(events[0].clone());
12321231
service_node.inner.node.handle_update_add_htlc(payer_node_id, &ev.msgs[0]);
@@ -1566,7 +1565,7 @@ fn create_channel_with_manual_broadcast(
15661565
let funding_created =
15671566
get_event_msg!(service_node, MessageSendEvent::SendFundingCreated, *client_node_id);
15681567
client_node.node.handle_funding_created(*service_node_id, &funding_created);
1569-
check_added_monitors!(client_node.inner, 1);
1568+
check_added_monitors(&client_node.inner, 1);
15701569

15711570
let bs_signed_locked = client_node.node.get_and_clear_pending_msg_events();
15721571
assert_eq!(bs_signed_locked.len(), 2);
@@ -1602,7 +1601,7 @@ fn create_channel_with_manual_broadcast(
16021601
_ => panic!("Unexpected event"),
16031602
}
16041603
expect_channel_pending_event(&client_node, &service_node_id);
1605-
check_added_monitors!(service_node.inner, 1);
1604+
check_added_monitors(&service_node.inner, 1);
16061605

16071606
as_channel_ready =
16081607
get_event_msg!(service_node, MessageSendEvent::SendChannelReady, *client_node_id);
@@ -1699,7 +1698,7 @@ fn late_payment_forwarded_and_safe_after_force_close_does_not_broadcast() {
16991698
)
17001699
.unwrap();
17011700

1702-
check_added_monitors!(payer_node, 1);
1701+
check_added_monitors(&payer_node, 1);
17031702
let events = payer_node.node.get_and_clear_pending_msg_events();
17041703
let ev = SendEvent::from_event(events[0].clone());
17051704
service_node.inner.node.handle_update_add_htlc(payer_node_id, &ev.msgs[0]);
@@ -1890,7 +1889,7 @@ fn htlc_timeout_before_client_claim_results_in_handling_failed() {
18901889
)
18911890
.unwrap();
18921891

1893-
check_added_monitors!(payer_node, 1);
1892+
check_added_monitors(&payer_node, 1);
18941893
let events = payer_node.node.get_and_clear_pending_msg_events();
18951894
let ev = SendEvent::from_event(events[0].clone());
18961895
service_node.inner.node.handle_update_add_htlc(payer_node_id, &ev.msgs[0]);
@@ -2227,7 +2226,7 @@ fn client_trusts_lsp_partial_fee_does_not_trigger_broadcast() {
22272226
)
22282227
.unwrap();
22292228

2230-
check_added_monitors!(payer_node, 1);
2229+
check_added_monitors(&payer_node, 1);
22312230
let events = payer_node.node.get_and_clear_pending_msg_events();
22322231
let ev = SendEvent::from_event(events[0].clone());
22332232
service_node.inner.node.handle_update_add_htlc(payer_node_id, &ev.msgs[0]);

‎lightning-persister/src/test_utils.rs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1+
use lightning::check_closed_broadcast;
12
use lightning::events::ClosureReason;
23
use lightning::ln::functional_test_utils::{
3-
check_closed_event, connect_block, create_announced_chan_between_nodes, create_chanmon_cfgs,
4-
create_dummy_block, create_network, create_node_cfgs, create_node_chanmgrs, send_payment,
4+
check_added_monitors, check_closed_event, connect_block, create_announced_chan_between_nodes,
5+
create_chanmon_cfgs, create_dummy_block, create_network, create_node_cfgs,
6+
create_node_chanmgrs, send_payment,
57
};
68
use lightning::util::persist::{
79
migrate_kv_store_data, read_channel_monitors, KVStoreSync, MigratableKVStore,
810
KVSTORE_NAMESPACE_KEY_ALPHABET, KVSTORE_NAMESPACE_KEY_MAX_LEN,
911
};
1012
use lightning::util::test_utils;
11-
use lightning::{check_added_monitors, check_closed_broadcast};
1213

1314
use std::panic::RefUnwindSafe;
1415

@@ -190,7 +191,7 @@ pub(crate) fn do_test_store<K: KVStoreSync + Sync>(store_0: &K, store_1: &K) {
190191
let reason = ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(true), message };
191192
check_closed_event(&nodes[0], 1, reason, &[node_b_id], 100000);
192193
check_closed_broadcast!(nodes[0], true);
193-
check_added_monitors!(nodes[0], 1);
194+
check_added_monitors(&nodes[0], 1);
194195

195196
let node_txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap();
196197
assert_eq!(node_txn.len(), 1);
@@ -206,7 +207,7 @@ pub(crate) fn do_test_store<K: KVStoreSync + Sync>(store_0: &K, store_1: &K) {
206207
check_closed_broadcast!(nodes[1], true);
207208
let reason = ClosureReason::CommitmentTxConfirmed;
208209
check_closed_event(&nodes[1], 1, reason, &[nodes[0].node.get_our_node_id()], 100000);
209-
check_added_monitors!(nodes[1], 1);
210+
check_added_monitors(&nodes[1], 1);
210211

211212
// Make sure everything is persisted as expected after close.
212213
check_persisted_data!(11);

‎lightning/src/chain/chainmonitor.rs‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1568,7 +1568,6 @@ where
15681568
mod tests {
15691569
use crate::chain::channelmonitor::ANTI_REORG_DELAY;
15701570
use crate::chain::{ChannelMonitorUpdateStatus, Watch};
1571-
use crate::check_added_monitors;
15721571
use crate::events::{ClosureReason, Event};
15731572
use crate::ln::functional_test_utils::*;
15741573
use crate::ln::msgs::{BaseMessageHandler, ChannelMessageHandler, MessageSendEvent};
@@ -1601,9 +1600,9 @@ mod tests {
16011600
chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
16021601

16031602
nodes[1].node.claim_funds(payment_preimage_1);
1604-
check_added_monitors!(nodes[1], 1);
1603+
check_added_monitors(&nodes[1], 1);
16051604
nodes[1].node.claim_funds(payment_preimage_2);
1606-
check_added_monitors!(nodes[1], 1);
1605+
check_added_monitors(&nodes[1], 1);
16071606

16081607
let persistences =
16091608
chanmon_cfgs[1].persister.offchain_monitor_updates.lock().unwrap().clone();
@@ -1666,14 +1665,14 @@ mod tests {
16661665
nodes[0].node.handle_update_fulfill_htlc(node_b_id, updates.update_fulfill_htlcs.remove(0));
16671666
expect_payment_sent(&nodes[0], payment_preimage_1, None, false, false);
16681667
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &updates.commitment_signed);
1669-
check_added_monitors!(nodes[0], 1);
1668+
check_added_monitors(&nodes[0], 1);
16701669
let (as_first_raa, as_first_update) = get_revoke_commit_msgs(&nodes[0], &node_b_id);
16711670

16721671
nodes[1].node.handle_revoke_and_ack(node_a_id, &as_first_raa);
1673-
check_added_monitors!(nodes[1], 1);
1672+
check_added_monitors(&nodes[1], 1);
16741673
let mut bs_2nd_updates = get_htlc_update_msgs(&nodes[1], &node_a_id);
16751674
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &as_first_update);
1676-
check_added_monitors!(nodes[1], 1);
1675+
check_added_monitors(&nodes[1], 1);
16771676
let bs_first_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, node_a_id);
16781677

16791678
nodes[0]
@@ -1683,21 +1682,21 @@ mod tests {
16831682
nodes[0]
16841683
.node
16851684
.handle_commitment_signed_batch_test(node_b_id, &bs_2nd_updates.commitment_signed);
1686-
check_added_monitors!(nodes[0], 1);
1685+
check_added_monitors(&nodes[0], 1);
16871686
nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_first_raa);
16881687
expect_payment_path_successful!(nodes[0]);
1689-
check_added_monitors!(nodes[0], 1);
1688+
check_added_monitors(&nodes[0], 1);
16901689
let (as_second_raa, as_second_update) = get_revoke_commit_msgs(&nodes[0], &node_b_id);
16911690

16921691
nodes[1].node.handle_revoke_and_ack(node_a_id, &as_second_raa);
1693-
check_added_monitors!(nodes[1], 1);
1692+
check_added_monitors(&nodes[1], 1);
16941693
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &as_second_update);
1695-
check_added_monitors!(nodes[1], 1);
1694+
check_added_monitors(&nodes[1], 1);
16961695
let bs_second_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, node_a_id);
16971696

16981697
nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_second_raa);
16991698
expect_payment_path_successful!(nodes[0]);
1700-
check_added_monitors!(nodes[0], 1);
1699+
check_added_monitors(&nodes[0], 1);
17011700
}
17021701

17031702
#[test]

‎lightning/src/chain/channelmonitor.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6911,10 +6911,7 @@ mod tests {
69116911
use crate::util::logger::Logger;
69126912
use crate::util::ser::{ReadableArgs, Writeable};
69136913
use crate::util::test_utils::{TestBroadcaster, TestFeeEstimator, TestLogger};
6914-
use crate::{
6915-
check_added_monitors, check_spends, get_local_commitment_txn, get_monitor,
6916-
get_route_and_payment_hash,
6917-
};
6914+
use crate::{check_spends, get_local_commitment_txn, get_monitor, get_route_and_payment_hash};
69186915

69196916
#[allow(unused_imports)]
69206917
use crate::prelude::*;
@@ -6973,7 +6970,7 @@ mod tests {
69736970
nodes[1].node.send_payment_with_route(route, payment_hash,
69746971
RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
69756972
).unwrap();
6976-
check_added_monitors!(nodes[1], 1);
6973+
check_added_monitors(&nodes[1], 1);
69776974

69786975
// Build a new ChannelMonitorUpdate which contains both the failing commitment tx update
69796976
// and provides the claim preimages for the two pending HTLCs. The first update generates

‎lightning/src/ln/async_payments_tests.rs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ fn ignore_duplicate_invoice() {
981981
assert_eq!(events.len(), 1);
982982
let ev = remove_first_msg_event_to_node(&always_online_node_id, &mut events);
983983
let payment_hash = extract_payment_hash(&ev);
984-
check_added_monitors!(sender, 1);
984+
check_added_monitors(&sender, 1);
985985

986986
let route: &[&[&Node]] = &[&[always_online_node, async_recipient]];
987987
let args = PassAlongPathArgs::new(sender, route[0], amt_msat, payment_hash, ev);
@@ -1060,7 +1060,7 @@ fn ignore_duplicate_invoice() {
10601060
assert_eq!(events.len(), 1);
10611061
let ev = remove_first_msg_event_to_node(&always_online_node_id, &mut events);
10621062
let payment_hash = extract_payment_hash(&ev);
1063-
check_added_monitors!(sender, 1);
1063+
check_added_monitors(&sender, 1);
10641064

10651065
let args = PassAlongPathArgs::new(sender, route[0], amt_msat, payment_hash, ev)
10661066
.without_clearing_recipient_events();
@@ -1129,7 +1129,7 @@ fn async_receive_flow_success() {
11291129
assert_eq!(events.len(), 1);
11301130
let ev = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
11311131
let payment_hash = extract_payment_hash(&ev);
1132-
check_added_monitors!(nodes[0], 1);
1132+
check_added_monitors(&nodes[0], 1);
11331133

11341134
// Receiving a duplicate release_htlc message doesn't result in duplicate payment.
11351135
nodes[0]
@@ -1519,7 +1519,7 @@ fn amount_doesnt_match_invreq() {
15191519
let mut ev = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
15201520
assert!(matches!(
15211521
ev, MessageSendEvent::UpdateHTLCs { ref updates, .. } if updates.update_add_htlcs.len() == 1));
1522-
check_added_monitors!(nodes[0], 1);
1522+
check_added_monitors(&nodes[0], 1);
15231523
let route: &[&[&Node]] = &[&[&nodes[2], &nodes[3]]];
15241524
let args = PassAlongPathArgs::new(&nodes[0], route[0], amt_msat, payment_hash, ev);
15251525
let claimable_ev = do_pass_along_path(args).unwrap();
@@ -1723,7 +1723,7 @@ fn invalid_async_receive_with_retry<F1, F2>(
17231723
&[HTLCHandlingFailureType::Receive { payment_hash }],
17241724
);
17251725
nodes[2].node.process_pending_htlc_forwards();
1726-
check_added_monitors!(nodes[2], 1);
1726+
check_added_monitors(&nodes[2], 1);
17271727
fail_blinded_htlc_backwards(payment_hash, 1, &[&nodes[0], &nodes[1], &nodes[2]], true);
17281728

17291729
// Trigger a retry and make sure it fails after calling the closure that induces recipient
@@ -1735,7 +1735,7 @@ fn invalid_async_receive_with_retry<F1, F2>(
17351735
let mut ev = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
17361736
assert!(matches!(
17371737
ev, MessageSendEvent::UpdateHTLCs { ref updates, .. } if updates.update_add_htlcs.len() == 1));
1738-
check_added_monitors!(nodes[0], 1);
1738+
check_added_monitors(&nodes[0], 1);
17391739
let route: &[&[&Node]] = &[&[&nodes[1], &nodes[2]]];
17401740
let args = PassAlongPathArgs::new(&nodes[0], route[0], amt_msat, payment_hash, ev)
17411741
.without_claimable_event()
@@ -1749,7 +1749,7 @@ fn invalid_async_receive_with_retry<F1, F2>(
17491749
let mut events = nodes[0].node.get_and_clear_pending_msg_events();
17501750
assert_eq!(events.len(), 1);
17511751
let mut ev = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
1752-
check_added_monitors!(nodes[0], 1);
1752+
check_added_monitors(&nodes[0], 1);
17531753
let route: &[&[&Node]] = &[&[&nodes[1], &nodes[2]]];
17541754
let args = PassAlongPathArgs::new(&nodes[0], route[0], amt_msat, payment_hash, ev);
17551755
let claimable_ev = do_pass_along_path(args).unwrap();
@@ -1915,7 +1915,7 @@ fn expired_static_invoice_payment_path() {
19151915
assert_eq!(events.len(), 1);
19161916
let ev = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
19171917
let payment_hash = extract_payment_hash(&ev);
1918-
check_added_monitors!(nodes[0], 1);
1918+
check_added_monitors(&nodes[0], 1);
19191919

19201920
let route: &[&[&Node]] = &[&[&nodes[1], &nodes[2]]];
19211921
let args = PassAlongPathArgs::new(&nodes[0], route[0], amt_msat, payment_hash, ev)
@@ -2360,7 +2360,7 @@ fn refresh_static_invoices_for_used_offers() {
23602360
assert_eq!(events.len(), 1);
23612361
let ev = remove_first_msg_event_to_node(&server.node.get_our_node_id(), &mut events);
23622362
let payment_hash = extract_payment_hash(&ev);
2363-
check_added_monitors!(sender, 1);
2363+
check_added_monitors(&sender, 1);
23642364

23652365
let route: &[&[&Node]] = &[&[server, recipient]];
23662366
let args = PassAlongPathArgs::new(sender, route[0], amt_msat, payment_hash, ev);
@@ -2694,7 +2694,7 @@ fn invoice_server_is_not_channel_peer() {
26942694
assert_eq!(events.len(), 1);
26952695
let ev = remove_first_msg_event_to_node(&forwarding_node.node.get_our_node_id(), &mut events);
26962696
let payment_hash = extract_payment_hash(&ev);
2697-
check_added_monitors!(sender, 1);
2697+
check_added_monitors(&sender, 1);
26982698

26992699
let route: &[&[&Node]] = &[&[forwarding_node, recipient]];
27002700
let args = PassAlongPathArgs::new(sender, route[0], amt_msat, payment_hash, ev);
@@ -2933,7 +2933,7 @@ fn async_payment_e2e() {
29332933
let mut events = sender_lsp.node.get_and_clear_pending_msg_events();
29342934
assert_eq!(events.len(), 1);
29352935
let ev = remove_first_msg_event_to_node(&invoice_server.node.get_our_node_id(), &mut events);
2936-
check_added_monitors!(sender_lsp, 1);
2936+
check_added_monitors(&sender_lsp, 1);
29372937

29382938
let path: &[&Node] = &[invoice_server, recipient];
29392939
let args = PassAlongPathArgs::new(sender_lsp, path, amt_msat, payment_hash, ev);
@@ -3170,7 +3170,7 @@ fn intercepted_hold_htlc() {
31703170
let mut events = lsp.node.get_and_clear_pending_msg_events();
31713171
assert_eq!(events.len(), 1);
31723172
let ev = remove_first_msg_event_to_node(&recipient.node.get_our_node_id(), &mut events);
3173-
check_added_monitors!(lsp, 1);
3173+
check_added_monitors(&lsp, 1);
31743174

31753175
let path: &[&Node] = &[recipient];
31763176
let args = PassAlongPathArgs::new(lsp, path, amt_msat, payment_hash, ev);
@@ -3271,7 +3271,7 @@ fn async_payment_mpp() {
32713271

32723272
let expected_path: &[&Node] = &[recipient];
32733273
lsp_a.node.process_pending_htlc_forwards();
3274-
check_added_monitors!(lsp_a, 1);
3274+
check_added_monitors(&lsp_a, 1);
32753275
let mut events = lsp_a.node.get_and_clear_pending_msg_events();
32763276
assert_eq!(events.len(), 1);
32773277
let ev = remove_first_msg_event_to_node(&recipient.node.get_our_node_id(), &mut events);
@@ -3280,7 +3280,7 @@ fn async_payment_mpp() {
32803280
do_pass_along_path(args);
32813281

32823282
lsp_b.node.process_pending_htlc_forwards();
3283-
check_added_monitors!(lsp_b, 1);
3283+
check_added_monitors(&lsp_b, 1);
32843284
let mut events = lsp_b.node.get_and_clear_pending_msg_events();
32853285
assert_eq!(events.len(), 1);
32863286
let ev = remove_first_msg_event_to_node(&recipient.node.get_our_node_id(), &mut events);
@@ -3417,7 +3417,7 @@ fn release_htlc_races_htlc_onion_decode() {
34173417
let mut events = sender_lsp.node.get_and_clear_pending_msg_events();
34183418
assert_eq!(events.len(), 1);
34193419
let ev = remove_first_msg_event_to_node(&invoice_server.node.get_our_node_id(), &mut events);
3420-
check_added_monitors!(sender_lsp, 1);
3420+
check_added_monitors(&sender_lsp, 1);
34213421

34223422
let path: &[&Node] = &[invoice_server, recipient];
34233423
let args = PassAlongPathArgs::new(sender_lsp, path, amt_msat, payment_hash, ev);

0 commit comments

Comments
 (0)