Skip to content

Commit 0ef429e

Browse files
elnoshelnosh
committed
Remove get_revoke_commit_msgs macro
Replace calls to `get_revoke_commit_msgs` macro to the identically-named function.
1 parent e42e74e commit 0ef429e

11 files changed

+54
-64
lines changed

‎lightning/src/chain/chainmonitor.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1597,11 +1597,11 @@ mod tests {
15971597
use crate::chain::channelmonitor::ANTI_REORG_DELAY;
15981598
use crate::chain::{ChannelMonitorUpdateStatus, Watch};
15991599
use crate::events::{ClosureReason, Event};
1600+
use crate::get_htlc_update_msgs;
16001601
use crate::ln::functional_test_utils::*;
16011602
use crate::ln::msgs::{BaseMessageHandler, ChannelMessageHandler, MessageSendEvent};
16021603
use crate::{check_added_monitors, check_closed_event};
16031604
use crate::{expect_payment_path_successful, get_event_msg};
1604-
use crate::{get_htlc_update_msgs, get_revoke_commit_msgs};
16051605

16061606
const CHAINSYNC_MONITOR_PARTITION_FACTOR: u32 = 5;
16071607

@@ -1696,7 +1696,7 @@ mod tests {
16961696
expect_payment_sent(&nodes[0], payment_preimage_1, None, false, false);
16971697
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &updates.commitment_signed);
16981698
check_added_monitors!(nodes[0], 1);
1699-
let (as_first_raa, as_first_update) = get_revoke_commit_msgs!(nodes[0], node_b_id);
1699+
let (as_first_raa, as_first_update) = get_revoke_commit_msgs(&nodes[0], &node_b_id);
17001700

17011701
nodes[1].node.handle_revoke_and_ack(node_a_id, &as_first_raa);
17021702
check_added_monitors!(nodes[1], 1);
@@ -1716,7 +1716,7 @@ mod tests {
17161716
nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_first_raa);
17171717
expect_payment_path_successful!(nodes[0]);
17181718
check_added_monitors!(nodes[0], 1);
1719-
let (as_second_raa, as_second_update) = get_revoke_commit_msgs!(nodes[0], node_b_id);
1719+
let (as_second_raa, as_second_update) = get_revoke_commit_msgs(&nodes[0], &node_b_id);
17201720

17211721
nodes[1].node.handle_revoke_and_ack(node_a_id, &as_second_raa);
17221722
check_added_monitors!(nodes[1], 1);

‎lightning/src/ln/chanmon_update_fail_tests.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ fn test_monitor_update_raa_while_paused() {
941941
nodes[0].chain_monitor.chain_monitor.force_channel_monitor_updated(channel_id, latest_update);
942942
check_added_monitors!(nodes[0], 0);
943943

944-
let as_update_raa = get_revoke_commit_msgs!(nodes[0], node_b_id);
944+
let as_update_raa = get_revoke_commit_msgs(&nodes[0], &node_b_id);
945945
nodes[1].node.handle_revoke_and_ack(node_a_id, &as_update_raa.0);
946946
check_added_monitors!(nodes[1], 1);
947947
let bs_cs = get_htlc_update_msgs!(nodes[1], node_a_id);
@@ -1412,7 +1412,7 @@ fn raa_no_response_awaiting_raa_state() {
14121412
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &payment_event.commitment_msg);
14131413
check_added_monitors!(nodes[1], 1);
14141414

1415-
let bs_responses = get_revoke_commit_msgs!(nodes[1], node_a_id);
1415+
let bs_responses = get_revoke_commit_msgs(&nodes[1], &node_a_id);
14161416
nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_responses.0);
14171417
check_added_monitors!(nodes[0], 1);
14181418
let mut events = nodes[0].node.get_and_clear_pending_msg_events();
@@ -1442,7 +1442,7 @@ fn raa_no_response_awaiting_raa_state() {
14421442
nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(channel_id, latest_update);
14431443
// nodes[1] should be AwaitingRAA here!
14441444
check_added_monitors!(nodes[1], 0);
1445-
let bs_responses = get_revoke_commit_msgs!(nodes[1], node_a_id);
1445+
let bs_responses = get_revoke_commit_msgs(&nodes[1], &node_a_id);
14461446
expect_and_process_pending_htlcs(&nodes[1], false);
14471447
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
14481448

@@ -1699,7 +1699,7 @@ fn monitor_failed_no_reestablish_response() {
16991699
let (latest_update, _) = get_latest_mon_update_id(&nodes[1], channel_id);
17001700
nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(channel_id, latest_update);
17011701
check_added_monitors!(nodes[1], 0);
1702-
let bs_responses = get_revoke_commit_msgs!(nodes[1], node_a_id);
1702+
let bs_responses = get_revoke_commit_msgs(&nodes[1], &node_a_id);
17031703

17041704
nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_responses.0);
17051705
check_added_monitors!(nodes[0], 1);
@@ -1754,7 +1754,7 @@ fn first_message_on_recv_ordering() {
17541754
nodes[1].node.handle_update_add_htlc(node_a_id, &payment_event.msgs[0]);
17551755
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &payment_event.commitment_msg);
17561756
check_added_monitors!(nodes[1], 1);
1757-
let bs_responses = get_revoke_commit_msgs!(nodes[1], node_a_id);
1757+
let bs_responses = get_revoke_commit_msgs(&nodes[1], &node_a_id);
17581758

17591759
nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_responses.0);
17601760
check_added_monitors!(nodes[0], 1);
@@ -1802,7 +1802,7 @@ fn first_message_on_recv_ordering() {
18021802
expect_and_process_pending_htlcs(&nodes[1], false);
18031803
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
18041804

1805-
let bs_responses = get_revoke_commit_msgs!(nodes[1], node_a_id);
1805+
let bs_responses = get_revoke_commit_msgs(&nodes[1], &node_a_id);
18061806
nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_responses.0);
18071807
check_added_monitors!(nodes[0], 1);
18081808
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &bs_responses.1);
@@ -2601,7 +2601,7 @@ fn do_update_fee_resend_test(deliver_update: bool, parallel_updates: bool) {
26012601
.node
26022602
.handle_commitment_signed_batch_test(node_a_id, &update_msgs.commitment_signed);
26032603
check_added_monitors!(nodes[1], 1);
2604-
let (bs_first_raa, bs_first_cs) = get_revoke_commit_msgs!(nodes[1], node_a_id);
2604+
let (bs_first_raa, bs_first_cs) = get_revoke_commit_msgs(&nodes[1], &node_a_id);
26052605
nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_first_raa);
26062606
check_added_monitors!(nodes[0], 1);
26072607
let as_second_update = get_htlc_update_msgs!(nodes[0], node_b_id);
@@ -2713,7 +2713,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
27132713
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &send.commitment_msg);
27142714
check_added_monitors!(nodes[1], 1);
27152715

2716-
let (raa, cs) = get_revoke_commit_msgs!(nodes[1], node_a_id);
2716+
let (raa, cs) = get_revoke_commit_msgs(&nodes[1], &node_a_id);
27172717

27182718
nodes[0].node.handle_revoke_and_ack(node_b_id, &raa);
27192719
check_added_monitors!(nodes[0], 1);
@@ -2891,7 +2891,7 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
28912891
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &send_event.commitment_msg);
28922892
check_added_monitors!(nodes[1], 1);
28932893

2894-
let (bs_raa, bs_cs) = get_revoke_commit_msgs!(nodes[1], node_a_id);
2894+
let (bs_raa, bs_cs) = get_revoke_commit_msgs(&nodes[1], &node_a_id);
28952895
nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_raa);
28962896
check_added_monitors!(nodes[0], 1);
28972897
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &bs_cs);
@@ -3171,7 +3171,7 @@ fn double_temp_error() {
31713171
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &commitment_signed_b1);
31723172
check_added_monitors!(nodes[0], 1);
31733173
nodes[0].node.process_pending_htlc_forwards();
3174-
let (raa_a1, commitment_signed_a1) = get_revoke_commit_msgs!(nodes[0], node_b_id);
3174+
let (raa_a1, commitment_signed_a1) = get_revoke_commit_msgs(&nodes[0], &node_b_id);
31753175
check_added_monitors!(nodes[1], 0);
31763176
assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
31773177
nodes[1].node.handle_revoke_and_ack(node_a_id, &raa_a1);
@@ -3644,7 +3644,7 @@ fn do_test_inverted_mon_completion_order(
36443644
check_added_monitors(&nodes[1], 1);
36453645
if complete_bc_commitment_dance {
36463646
let (bs_revoke_and_ack, bs_commitment_signed) =
3647-
get_revoke_commit_msgs!(nodes[1], node_c_id);
3647+
get_revoke_commit_msgs(&nodes[1], &node_c_id);
36483648
nodes[2].node.handle_revoke_and_ack(node_b_id, &bs_revoke_and_ack);
36493649
check_added_monitors(&nodes[2], 1);
36503650
nodes[2].node.handle_commitment_signed_batch_test(node_b_id, &bs_commitment_signed);
@@ -3830,7 +3830,7 @@ fn do_test_durable_preimages_on_closed_channel(
38303830
// ChannelMonitor.
38313831
nodes[1].node.handle_commitment_signed_batch_test(node_c_id, &cs_updates.commitment_signed);
38323832
check_added_monitors(&nodes[1], 1);
3833-
let _ = get_revoke_commit_msgs!(nodes[1], node_c_id);
3833+
let _ = get_revoke_commit_msgs(&nodes[1], &node_c_id);
38343834

38353835
let mon_bc = get_monitor!(nodes[1], chan_id_bc).encode();
38363836

@@ -4023,7 +4023,7 @@ fn do_test_reload_mon_update_completion_actions(close_during_reload: bool) {
40234023
// doesn't let the preimage-removing monitor update fly.
40244024
nodes[1].node.handle_commitment_signed_batch_test(node_c_id, &cs_updates.commitment_signed);
40254025
check_added_monitors(&nodes[1], 1);
4026-
let (bs_raa, bs_cs) = get_revoke_commit_msgs!(nodes[1], node_c_id);
4026+
let (bs_raa, bs_cs) = get_revoke_commit_msgs(&nodes[1], &node_c_id);
40274027

40284028
nodes[2].node.handle_revoke_and_ack(node_b_id, &bs_raa);
40294029
check_added_monitors(&nodes[2], 1);

‎lightning/src/ln/channelmanager.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18590,7 +18590,7 @@ mod tests {
1859018590
expect_payment_sent(&nodes[0], payment_preimage, None, false, false);
1859118591
nodes[0].node.handle_commitment_signed_batch_test(nodes[1].node.get_our_node_id(), &bs_1st_updates.commitment_signed);
1859218592
check_added_monitors!(nodes[0], 1);
18593-
let (as_first_raa, as_first_cs) = get_revoke_commit_msgs!(nodes[0], nodes[1].node.get_our_node_id());
18593+
let (as_first_raa, as_first_cs) = get_revoke_commit_msgs(&nodes[0], &nodes[1].node.get_our_node_id());
1859418594
nodes[1].node.handle_revoke_and_ack(nodes[0].node.get_our_node_id(), &as_first_raa);
1859518595
check_added_monitors!(nodes[1], 1);
1859618596
let mut bs_2nd_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

‎lightning/src/ln/functional_test_utils.rs‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,16 +1014,6 @@ pub fn get_updates_and_revoke<CM: AChannelManager, H: NodeHolder<CM = CM>>(
10141014
)
10151015
}
10161016

1017-
#[macro_export]
1018-
/// Gets an RAA and CS which were sent in response to a commitment update
1019-
///
1020-
/// Don't use this, use the identically-named function instead.
1021-
macro_rules! get_revoke_commit_msgs {
1022-
($node: expr, $node_id: expr) => {
1023-
$crate::ln::functional_test_utils::get_revoke_commit_msgs(&$node, &$node_id)
1024-
};
1025-
}
1026-
10271017
/// Get an specific event message from the pending events queue.
10281018
#[macro_export]
10291019
macro_rules! get_event_msg {
@@ -2728,7 +2718,7 @@ pub fn do_main_commitment_signed_dance(
27282718
let node_a_id = node_a.node.get_our_node_id();
27292719
let node_b_id = node_b.node.get_our_node_id();
27302720

2731-
let (as_revoke_and_ack, as_commitment_signed) = get_revoke_commit_msgs!(node_a, node_b_id);
2721+
let (as_revoke_and_ack, as_commitment_signed) = get_revoke_commit_msgs(node_a, &node_b_id);
27322722
check_added_monitors!(node_b, 0);
27332723
assert!(node_b.node.get_and_clear_pending_msg_events().is_empty());
27342724
node_b.node.handle_revoke_and_ack(node_a_id, &as_revoke_and_ack);

‎lightning/src/ln/functional_tests.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2392,7 +2392,7 @@ pub fn test_force_close_fail_back() {
23922392
nodes[2].node.handle_update_add_htlc(node_b_id, &payment_event.msgs[0]);
23932393
nodes[2].node.handle_commitment_signed_batch_test(node_b_id, &payment_event.commitment_msg);
23942394
check_added_monitors(&nodes[2], 1);
2395-
let (_, _) = get_revoke_commit_msgs!(nodes[2], node_b_id);
2395+
let _ = get_revoke_commit_msgs(&nodes[2], &node_b_id);
23962396

23972397
// nodes[2] now has the latest commitment transaction, but hasn't revoked its previous
23982398
// state or updated nodes[1]' state. Now force-close and broadcast that commitment/HTLC
@@ -2673,7 +2673,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
26732673
.handle_commitment_signed_batch_test(node_a_id, &payment_event.commitment_msg);
26742674
check_added_monitors(&nodes[1], 1);
26752675
let (bs_revoke_and_ack, bs_commitment_signed) =
2676-
get_revoke_commit_msgs!(nodes[1], node_a_id);
2676+
get_revoke_commit_msgs(&nodes[1], &node_a_id);
26772677

26782678
if messages_delivered >= 4 {
26792679
nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_revoke_and_ack);
@@ -2837,7 +2837,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
28372837
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &commitment_signed);
28382838
check_added_monitors(&nodes[0], 1);
28392839
let (as_revoke_and_ack, as_commitment_signed) =
2840-
get_revoke_commit_msgs!(nodes[0], node_b_id);
2840+
get_revoke_commit_msgs(&nodes[0], &node_b_id);
28412841

28422842
if messages_delivered >= 3 {
28432843
nodes[1].node.handle_revoke_and_ack(node_a_id, &as_revoke_and_ack);
@@ -4930,7 +4930,7 @@ fn do_htlc_claim_local_commitment_only(use_dust: bool) {
49304930

49314931
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &bs_updates.commitment_signed);
49324932
check_added_monitors(&nodes[0], 1);
4933-
let as_updates = get_revoke_commit_msgs!(nodes[0], node_b_id);
4933+
let as_updates = get_revoke_commit_msgs(&nodes[0], &node_b_id);
49344934
nodes[1].node.handle_revoke_and_ack(node_a_id, &as_updates.0);
49354935
check_added_monitors(&nodes[1], 1);
49364936

@@ -5015,7 +5015,7 @@ fn do_htlc_claim_previous_remote_commitment_only(use_dust: bool, check_revoke_no
50155015
nodes[0].node.handle_update_fail_htlc(node_b_id, &bs_updates.update_fail_htlcs[0]);
50165016
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &bs_updates.commitment_signed);
50175017
check_added_monitors(&nodes[0], 1);
5018-
let as_updates = get_revoke_commit_msgs!(nodes[0], node_b_id);
5018+
let as_updates = get_revoke_commit_msgs(&nodes[0], &node_b_id);
50195019
nodes[1].node.handle_revoke_and_ack(node_a_id, &as_updates.0);
50205020
check_added_monitors(&nodes[1], 1);
50215021
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &as_updates.1);
@@ -5131,7 +5131,7 @@ pub fn test_fail_holding_cell_htlc_upon_free() {
51315131

51325132
// Flush the pending fee update.
51335133
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, commitment_signed);
5134-
let (as_revoke_and_ack, _) = get_revoke_commit_msgs!(nodes[1], node_a_id);
5134+
let (as_revoke_and_ack, _) = get_revoke_commit_msgs(&nodes[1], &node_a_id);
51355135
check_added_monitors(&nodes[1], 1);
51365136
nodes[0].node.handle_revoke_and_ack(node_b_id, &as_revoke_and_ack);
51375137
check_added_monitors(&nodes[0], 1);
@@ -5241,7 +5241,7 @@ pub fn test_free_and_fail_holding_cell_htlcs() {
52415241

52425242
// Flush the pending fee update.
52435243
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, commitment_signed);
5244-
let (revoke_and_ack, commitment_signed) = get_revoke_commit_msgs!(nodes[1], node_a_id);
5244+
let (revoke_and_ack, commitment_signed) = get_revoke_commit_msgs(&nodes[1], &node_a_id);
52455245
check_added_monitors(&nodes[1], 1);
52465246
nodes[0].node.handle_revoke_and_ack(node_b_id, &revoke_and_ack);
52475247
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &commitment_signed);
@@ -5393,7 +5393,7 @@ pub fn test_fail_holding_cell_htlc_upon_free_multihop() {
53935393

53945394
// Flush the pending fee update.
53955395
nodes[2].node.handle_commitment_signed_batch_test(node_b_id, commitment_signed);
5396-
let (raa, commitment_signed) = get_revoke_commit_msgs!(nodes[2], node_b_id);
5396+
let (raa, commitment_signed) = get_revoke_commit_msgs(&nodes[2], &node_b_id);
53975397
check_added_monitors(&nodes[2], 1);
53985398
nodes[1].node.handle_revoke_and_ack(node_c_id, &raa);
53995399
nodes[1].node.handle_commitment_signed_batch_test(node_c_id, &commitment_signed);
@@ -5437,7 +5437,7 @@ pub fn test_fail_holding_cell_htlc_upon_free_multihop() {
54375437
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &commitment_signed);
54385438

54395439
// Complete the HTLC failure+removal process.
5440-
let (raa, commitment_signed) = get_revoke_commit_msgs!(nodes[0], node_b_id);
5440+
let (raa, commitment_signed) = get_revoke_commit_msgs(&nodes[0], &node_b_id);
54415441
check_added_monitors(&nodes[0], 1);
54425442
nodes[1].node.handle_revoke_and_ack(node_a_id, &raa);
54435443
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &commitment_signed);
@@ -9420,7 +9420,7 @@ pub fn test_disconnects_peer_awaiting_response_ticks() {
94209420
check_added_monitors(&&nodes[1], 1);
94219421

94229422
// This will prompt Bob (nodes[1]) to respond with his `CommitmentSigned` and `RevokeAndACK`.
9423-
let (bob_revoke_and_ack, bob_commitment_signed) = get_revoke_commit_msgs!(&nodes[1], node_a_id);
9423+
let (bob_revoke_and_ack, bob_commitment_signed) = get_revoke_commit_msgs(&nodes[1], &node_a_id);
94249424
nodes[0].node.handle_revoke_and_ack(node_b_id, &bob_revoke_and_ack);
94259425
check_added_monitors(&&nodes[0], 1);
94269426
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &bob_commitment_signed);

‎lightning/src/ln/htlc_reserve_unit_tests.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ pub fn test_channel_reserve_holding_cell_htlcs() {
326326

327327
// flush the pending htlc
328328
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &payment_event_1.commitment_msg);
329-
let (as_revoke_and_ack, as_commitment_signed) = get_revoke_commit_msgs!(nodes[1], node_a_id);
329+
let (as_revoke_and_ack, as_commitment_signed) = get_revoke_commit_msgs(&nodes[1], &node_a_id);
330330
check_added_monitors(&nodes[1], 1);
331331

332332
// the pending htlc should be promoted to committed
@@ -695,7 +695,7 @@ pub fn holding_cell_htlc_counting() {
695695
.handle_commitment_signed_batch_test(node_b_id, &initial_payment_event.commitment_msg);
696696
check_added_monitors(&nodes[2], 1);
697697

698-
let (bs_revoke_and_ack, bs_commitment_signed) = get_revoke_commit_msgs!(nodes[2], node_b_id);
698+
let (bs_revoke_and_ack, bs_commitment_signed) = get_revoke_commit_msgs(&nodes[2], &node_b_id);
699699
nodes[1].node.handle_revoke_and_ack(node_c_id, &bs_revoke_and_ack);
700700
check_added_monitors(&nodes[1], 1);
701701
let as_updates = get_htlc_update_msgs!(nodes[1], node_c_id);
@@ -711,7 +711,7 @@ pub fn holding_cell_htlc_counting() {
711711
check_added_monitors(&nodes[2], 1);
712712
nodes[2].node.handle_revoke_and_ack(node_b_id, &as_raa);
713713
check_added_monitors(&nodes[2], 1);
714-
let (bs_revoke_and_ack, bs_commitment_signed) = get_revoke_commit_msgs!(nodes[2], node_b_id);
714+
let (bs_revoke_and_ack, bs_commitment_signed) = get_revoke_commit_msgs(&nodes[2], &node_b_id);
715715

716716
nodes[1].node.handle_revoke_and_ack(node_c_id, &bs_revoke_and_ack);
717717
check_added_monitors(&nodes[1], 1);
@@ -1778,7 +1778,7 @@ pub fn test_update_add_htlc_bolt2_receiver_check_repeated_id_ignore() {
17781778
assert_eq!(updates.commitment_signed[0].htlc_signatures.len(), 1);
17791779
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &updates.commitment_signed);
17801780
check_added_monitors(&nodes[1], 1);
1781-
let _bs_responses = get_revoke_commit_msgs!(nodes[1], node_a_id);
1781+
let _bs_responses = get_revoke_commit_msgs(&nodes[1], &node_a_id);
17821782

17831783
nodes[1].node.handle_update_add_htlc(node_a_id, &updates.update_add_htlcs[0]);
17841784

‎lightning/src/ln/monitor_tests.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use crate::chain::Watch;
1616
use crate::chain::channelmonitor::{Balance, BalanceSource, ChannelMonitorUpdateStep, HolderCommitmentTransactionBalance, ANTI_REORG_DELAY, ARCHIVAL_DELAY_BLOCKS, COUNTERPARTY_CLAIMABLE_WITHIN_BLOCKS_PINNABLE, LATENCY_GRACE_PERIOD_BLOCKS};
1717
use crate::chain::transaction::OutPoint;
1818
use crate::chain::chaininterface::{ConfirmationTarget, LowerBoundedFeeEstimator, compute_feerate_sat_per_1000_weight};
19-
use crate::events::bump_transaction::{BumpTransactionEvent};
19+
use crate::events::bump_transaction::BumpTransactionEvent;
2020
use crate::events::{Event, ClosureReason, HTLCHandlingFailureType};
2121
use crate::ln::channel;
2222
use crate::ln::types::ChannelId;
@@ -586,7 +586,7 @@ fn do_test_claim_value_force_close(keyed_anchors: bool, p2a_anchor: bool, prev_c
586586
expect_payment_sent(&nodes[0], payment_preimage, None, false, false);
587587
nodes[0].node.handle_commitment_signed_batch_test(nodes[1].node.get_our_node_id(), &b_htlc_msgs.commitment_signed);
588588
check_added_monitors!(nodes[0], 1);
589-
let (as_raa, as_cs) = get_revoke_commit_msgs!(nodes[0], nodes[1].node.get_our_node_id());
589+
let (as_raa, as_cs) = get_revoke_commit_msgs(&nodes[0], &nodes[1].node.get_our_node_id());
590590
nodes[1].node.handle_revoke_and_ack(nodes[0].node.get_our_node_id(), &as_raa);
591591
let _htlc_updates = get_htlc_update_msgs!(&nodes[1], nodes[0].node.get_our_node_id());
592592
check_added_monitors!(nodes[1], 1);
@@ -3655,7 +3655,7 @@ fn do_test_lost_timeout_monitor_events(confirm_tx: CommitmentType, dust_htlcs: b
36553655
nodes[2].node.handle_commitment_signed_batch_test(node_b_id, &updates.commitment_signed);
36563656
check_added_monitors(&nodes[2], 1);
36573657

3658-
let (cs_raa, cs_cs) = get_revoke_commit_msgs!(nodes[2], node_b_id);
3658+
let (cs_raa, cs_cs) = get_revoke_commit_msgs(&nodes[2], &node_b_id);
36593659
if confirm_tx == CommitmentType::LocalWithLastHTLC {
36603660
// Only deliver the last RAA + CS if we need to update the local commitment with the third
36613661
// HTLC.

0 commit comments

Comments
 (0)