Skip to content

Remove get_revoke_commit_msgs macro #4215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2025
Merged

Remove get_revoke_commit_msgs macro #4215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lightning/src/chain/chainmonitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1597,11 +1597,11 @@ mod tests {
use crate::chain::channelmonitor::ANTI_REORG_DELAY;
use crate::chain::{ChannelMonitorUpdateStatus, Watch};
use crate::events::{ClosureReason, Event};
use crate::get_htlc_update_msgs;
use crate::ln::functional_test_utils::*;
use crate::ln::msgs::{BaseMessageHandler, ChannelMessageHandler, MessageSendEvent};
use crate::{check_added_monitors, check_closed_event};
use crate::{expect_payment_path_successful, get_event_msg};
use crate::{get_htlc_update_msgs, get_revoke_commit_msgs};

const CHAINSYNC_MONITOR_PARTITION_FACTOR: u32 = 5;

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

nodes[1].node.handle_revoke_and_ack(node_a_id, &as_first_raa);
check_added_monitors!(nodes[1], 1);
Expand All @@ -1716,7 +1716,7 @@ mod tests {
nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_first_raa);
expect_payment_path_successful!(nodes[0]);
check_added_monitors!(nodes[0], 1);
let (as_second_raa, as_second_update) = get_revoke_commit_msgs!(nodes[0], node_b_id);
let (as_second_raa, as_second_update) = get_revoke_commit_msgs(&nodes[0], &node_b_id);

nodes[1].node.handle_revoke_and_ack(node_a_id, &as_second_raa);
check_added_monitors!(nodes[1], 1);
Expand Down
26 changes: 13 additions & 13 deletions lightning/src/ln/chanmon_update_fail_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@ fn test_monitor_update_raa_while_paused() {
nodes[0].chain_monitor.chain_monitor.force_channel_monitor_updated(channel_id, latest_update);
check_added_monitors!(nodes[0], 0);

let as_update_raa = get_revoke_commit_msgs!(nodes[0], node_b_id);
let as_update_raa = get_revoke_commit_msgs(&nodes[0], &node_b_id);
nodes[1].node.handle_revoke_and_ack(node_a_id, &as_update_raa.0);
check_added_monitors!(nodes[1], 1);
let bs_cs = get_htlc_update_msgs!(nodes[1], node_a_id);
Expand Down Expand Up @@ -1412,7 +1412,7 @@ fn raa_no_response_awaiting_raa_state() {
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &payment_event.commitment_msg);
check_added_monitors!(nodes[1], 1);

let bs_responses = get_revoke_commit_msgs!(nodes[1], node_a_id);
let bs_responses = get_revoke_commit_msgs(&nodes[1], &node_a_id);
nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_responses.0);
check_added_monitors!(nodes[0], 1);
let mut events = nodes[0].node.get_and_clear_pending_msg_events();
Expand Down Expand Up @@ -1442,7 +1442,7 @@ fn raa_no_response_awaiting_raa_state() {
nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(channel_id, latest_update);
// nodes[1] should be AwaitingRAA here!
check_added_monitors!(nodes[1], 0);
let bs_responses = get_revoke_commit_msgs!(nodes[1], node_a_id);
let bs_responses = get_revoke_commit_msgs(&nodes[1], &node_a_id);
expect_and_process_pending_htlcs(&nodes[1], false);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

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

nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_responses.0);
check_added_monitors!(nodes[0], 1);
Expand Down Expand Up @@ -1754,7 +1754,7 @@ fn first_message_on_recv_ordering() {
nodes[1].node.handle_update_add_htlc(node_a_id, &payment_event.msgs[0]);
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &payment_event.commitment_msg);
check_added_monitors!(nodes[1], 1);
let bs_responses = get_revoke_commit_msgs!(nodes[1], node_a_id);
let bs_responses = get_revoke_commit_msgs(&nodes[1], &node_a_id);

nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_responses.0);
check_added_monitors!(nodes[0], 1);
Expand Down Expand Up @@ -1802,7 +1802,7 @@ fn first_message_on_recv_ordering() {
expect_and_process_pending_htlcs(&nodes[1], false);
expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);

let bs_responses = get_revoke_commit_msgs!(nodes[1], node_a_id);
let bs_responses = get_revoke_commit_msgs(&nodes[1], &node_a_id);
nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_responses.0);
check_added_monitors!(nodes[0], 1);
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &bs_responses.1);
Expand Down Expand Up @@ -2601,7 +2601,7 @@ fn do_update_fee_resend_test(deliver_update: bool, parallel_updates: bool) {
.node
.handle_commitment_signed_batch_test(node_a_id, &update_msgs.commitment_signed);
check_added_monitors!(nodes[1], 1);
let (bs_first_raa, bs_first_cs) = get_revoke_commit_msgs!(nodes[1], node_a_id);
let (bs_first_raa, bs_first_cs) = get_revoke_commit_msgs(&nodes[1], &node_a_id);
nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_first_raa);
check_added_monitors!(nodes[0], 1);
let as_second_update = get_htlc_update_msgs!(nodes[0], node_b_id);
Expand Down Expand Up @@ -2713,7 +2713,7 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &send.commitment_msg);
check_added_monitors!(nodes[1], 1);

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

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

let (bs_raa, bs_cs) = get_revoke_commit_msgs!(nodes[1], node_a_id);
let (bs_raa, bs_cs) = get_revoke_commit_msgs(&nodes[1], &node_a_id);
nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_raa);
check_added_monitors!(nodes[0], 1);
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &bs_cs);
Expand Down Expand Up @@ -3171,7 +3171,7 @@ fn double_temp_error() {
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &commitment_signed_b1);
check_added_monitors!(nodes[0], 1);
nodes[0].node.process_pending_htlc_forwards();
let (raa_a1, commitment_signed_a1) = get_revoke_commit_msgs!(nodes[0], node_b_id);
let (raa_a1, commitment_signed_a1) = get_revoke_commit_msgs(&nodes[0], &node_b_id);
check_added_monitors!(nodes[1], 0);
assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
nodes[1].node.handle_revoke_and_ack(node_a_id, &raa_a1);
Expand Down Expand Up @@ -3644,7 +3644,7 @@ fn do_test_inverted_mon_completion_order(
check_added_monitors(&nodes[1], 1);
if complete_bc_commitment_dance {
let (bs_revoke_and_ack, bs_commitment_signed) =
get_revoke_commit_msgs!(nodes[1], node_c_id);
get_revoke_commit_msgs(&nodes[1], &node_c_id);
nodes[2].node.handle_revoke_and_ack(node_b_id, &bs_revoke_and_ack);
check_added_monitors(&nodes[2], 1);
nodes[2].node.handle_commitment_signed_batch_test(node_b_id, &bs_commitment_signed);
Expand Down Expand Up @@ -3830,7 +3830,7 @@ fn do_test_durable_preimages_on_closed_channel(
// ChannelMonitor.
nodes[1].node.handle_commitment_signed_batch_test(node_c_id, &cs_updates.commitment_signed);
check_added_monitors(&nodes[1], 1);
let _ = get_revoke_commit_msgs!(nodes[1], node_c_id);
let _ = get_revoke_commit_msgs(&nodes[1], &node_c_id);

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

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

nodes[2].node.handle_revoke_and_ack(node_b_id, &bs_raa);
check_added_monitors(&nodes[2], 1);
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18590,7 +18590,7 @@ mod tests {
expect_payment_sent(&nodes[0], payment_preimage, None, false, false);
nodes[0].node.handle_commitment_signed_batch_test(nodes[1].node.get_our_node_id(), &bs_1st_updates.commitment_signed);
check_added_monitors!(nodes[0], 1);
let (as_first_raa, as_first_cs) = get_revoke_commit_msgs!(nodes[0], nodes[1].node.get_our_node_id());
let (as_first_raa, as_first_cs) = get_revoke_commit_msgs(&nodes[0], &nodes[1].node.get_our_node_id());
nodes[1].node.handle_revoke_and_ack(nodes[0].node.get_our_node_id(), &as_first_raa);
check_added_monitors!(nodes[1], 1);
let mut bs_2nd_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
Expand Down
12 changes: 1 addition & 11 deletions lightning/src/ln/functional_test_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,16 +1014,6 @@ pub fn get_updates_and_revoke<CM: AChannelManager, H: NodeHolder<CM = CM>>(
)
}

#[macro_export]
/// Gets an RAA and CS which were sent in response to a commitment update
///
/// Don't use this, use the identically-named function instead.
macro_rules! get_revoke_commit_msgs {
($node: expr, $node_id: expr) => {
$crate::ln::functional_test_utils::get_revoke_commit_msgs(&$node, &$node_id)
};
}

/// Get an specific event message from the pending events queue.
#[macro_export]
macro_rules! get_event_msg {
Expand Down Expand Up @@ -2728,7 +2718,7 @@ pub fn do_main_commitment_signed_dance(
let node_a_id = node_a.node.get_our_node_id();
let node_b_id = node_b.node.get_our_node_id();

let (as_revoke_and_ack, as_commitment_signed) = get_revoke_commit_msgs!(node_a, node_b_id);
let (as_revoke_and_ack, as_commitment_signed) = get_revoke_commit_msgs(node_a, &node_b_id);
check_added_monitors!(node_b, 0);
assert!(node_b.node.get_and_clear_pending_msg_events().is_empty());
node_b.node.handle_revoke_and_ack(node_a_id, &as_revoke_and_ack);
Expand Down
20 changes: 10 additions & 10 deletions lightning/src/ln/functional_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2392,7 +2392,7 @@ pub fn test_force_close_fail_back() {
nodes[2].node.handle_update_add_htlc(node_b_id, &payment_event.msgs[0]);
nodes[2].node.handle_commitment_signed_batch_test(node_b_id, &payment_event.commitment_msg);
check_added_monitors(&nodes[2], 1);
let (_, _) = get_revoke_commit_msgs!(nodes[2], node_b_id);
let _ = get_revoke_commit_msgs(&nodes[2], &node_b_id);

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

if messages_delivered >= 4 {
nodes[0].node.handle_revoke_and_ack(node_b_id, &bs_revoke_and_ack);
Expand Down Expand Up @@ -2837,7 +2837,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &commitment_signed);
check_added_monitors(&nodes[0], 1);
let (as_revoke_and_ack, as_commitment_signed) =
get_revoke_commit_msgs!(nodes[0], node_b_id);
get_revoke_commit_msgs(&nodes[0], &node_b_id);

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

nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &bs_updates.commitment_signed);
check_added_monitors(&nodes[0], 1);
let as_updates = get_revoke_commit_msgs!(nodes[0], node_b_id);
let as_updates = get_revoke_commit_msgs(&nodes[0], &node_b_id);
nodes[1].node.handle_revoke_and_ack(node_a_id, &as_updates.0);
check_added_monitors(&nodes[1], 1);

Expand Down Expand Up @@ -5015,7 +5015,7 @@ fn do_htlc_claim_previous_remote_commitment_only(use_dust: bool, check_revoke_no
nodes[0].node.handle_update_fail_htlc(node_b_id, &bs_updates.update_fail_htlcs[0]);
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &bs_updates.commitment_signed);
check_added_monitors(&nodes[0], 1);
let as_updates = get_revoke_commit_msgs!(nodes[0], node_b_id);
let as_updates = get_revoke_commit_msgs(&nodes[0], &node_b_id);
nodes[1].node.handle_revoke_and_ack(node_a_id, &as_updates.0);
check_added_monitors(&nodes[1], 1);
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &as_updates.1);
Expand Down Expand Up @@ -5131,7 +5131,7 @@ pub fn test_fail_holding_cell_htlc_upon_free() {

// Flush the pending fee update.
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, commitment_signed);
let (as_revoke_and_ack, _) = get_revoke_commit_msgs!(nodes[1], node_a_id);
let (as_revoke_and_ack, _) = get_revoke_commit_msgs(&nodes[1], &node_a_id);
check_added_monitors(&nodes[1], 1);
nodes[0].node.handle_revoke_and_ack(node_b_id, &as_revoke_and_ack);
check_added_monitors(&nodes[0], 1);
Expand Down Expand Up @@ -5241,7 +5241,7 @@ pub fn test_free_and_fail_holding_cell_htlcs() {

// Flush the pending fee update.
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, commitment_signed);
let (revoke_and_ack, commitment_signed) = get_revoke_commit_msgs!(nodes[1], node_a_id);
let (revoke_and_ack, commitment_signed) = get_revoke_commit_msgs(&nodes[1], &node_a_id);
check_added_monitors(&nodes[1], 1);
nodes[0].node.handle_revoke_and_ack(node_b_id, &revoke_and_ack);
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &commitment_signed);
Expand Down Expand Up @@ -5393,7 +5393,7 @@ pub fn test_fail_holding_cell_htlc_upon_free_multihop() {

// Flush the pending fee update.
nodes[2].node.handle_commitment_signed_batch_test(node_b_id, commitment_signed);
let (raa, commitment_signed) = get_revoke_commit_msgs!(nodes[2], node_b_id);
let (raa, commitment_signed) = get_revoke_commit_msgs(&nodes[2], &node_b_id);
check_added_monitors(&nodes[2], 1);
nodes[1].node.handle_revoke_and_ack(node_c_id, &raa);
nodes[1].node.handle_commitment_signed_batch_test(node_c_id, &commitment_signed);
Expand Down Expand Up @@ -5437,7 +5437,7 @@ pub fn test_fail_holding_cell_htlc_upon_free_multihop() {
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &commitment_signed);

// Complete the HTLC failure+removal process.
let (raa, commitment_signed) = get_revoke_commit_msgs!(nodes[0], node_b_id);
let (raa, commitment_signed) = get_revoke_commit_msgs(&nodes[0], &node_b_id);
check_added_monitors(&nodes[0], 1);
nodes[1].node.handle_revoke_and_ack(node_a_id, &raa);
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &commitment_signed);
Expand Down Expand Up @@ -9420,7 +9420,7 @@ pub fn test_disconnects_peer_awaiting_response_ticks() {
check_added_monitors(&&nodes[1], 1);

// This will prompt Bob (nodes[1]) to respond with his `CommitmentSigned` and `RevokeAndACK`.
let (bob_revoke_and_ack, bob_commitment_signed) = get_revoke_commit_msgs!(&nodes[1], node_a_id);
let (bob_revoke_and_ack, bob_commitment_signed) = get_revoke_commit_msgs(&nodes[1], &node_a_id);
nodes[0].node.handle_revoke_and_ack(node_b_id, &bob_revoke_and_ack);
check_added_monitors(&&nodes[0], 1);
nodes[0].node.handle_commitment_signed_batch_test(node_b_id, &bob_commitment_signed);
Expand Down
8 changes: 4 additions & 4 deletions lightning/src/ln/htlc_reserve_unit_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ pub fn test_channel_reserve_holding_cell_htlcs() {

// flush the pending htlc
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &payment_event_1.commitment_msg);
let (as_revoke_and_ack, as_commitment_signed) = get_revoke_commit_msgs!(nodes[1], node_a_id);
let (as_revoke_and_ack, as_commitment_signed) = get_revoke_commit_msgs(&nodes[1], &node_a_id);
check_added_monitors(&nodes[1], 1);

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

let (bs_revoke_and_ack, bs_commitment_signed) = get_revoke_commit_msgs!(nodes[2], node_b_id);
let (bs_revoke_and_ack, bs_commitment_signed) = get_revoke_commit_msgs(&nodes[2], &node_b_id);
nodes[1].node.handle_revoke_and_ack(node_c_id, &bs_revoke_and_ack);
check_added_monitors(&nodes[1], 1);
let as_updates = get_htlc_update_msgs!(nodes[1], node_c_id);
Expand All @@ -711,7 +711,7 @@ pub fn holding_cell_htlc_counting() {
check_added_monitors(&nodes[2], 1);
nodes[2].node.handle_revoke_and_ack(node_b_id, &as_raa);
check_added_monitors(&nodes[2], 1);
let (bs_revoke_and_ack, bs_commitment_signed) = get_revoke_commit_msgs!(nodes[2], node_b_id);
let (bs_revoke_and_ack, bs_commitment_signed) = get_revoke_commit_msgs(&nodes[2], &node_b_id);

nodes[1].node.handle_revoke_and_ack(node_c_id, &bs_revoke_and_ack);
check_added_monitors(&nodes[1], 1);
Expand Down Expand Up @@ -1778,7 +1778,7 @@ pub fn test_update_add_htlc_bolt2_receiver_check_repeated_id_ignore() {
assert_eq!(updates.commitment_signed[0].htlc_signatures.len(), 1);
nodes[1].node.handle_commitment_signed_batch_test(node_a_id, &updates.commitment_signed);
check_added_monitors(&nodes[1], 1);
let _bs_responses = get_revoke_commit_msgs!(nodes[1], node_a_id);
let _bs_responses = get_revoke_commit_msgs(&nodes[1], &node_a_id);

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

Expand Down
6 changes: 3 additions & 3 deletions lightning/src/ln/monitor_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use crate::chain::Watch;
use crate::chain::channelmonitor::{Balance, BalanceSource, ChannelMonitorUpdateStep, HolderCommitmentTransactionBalance, ANTI_REORG_DELAY, ARCHIVAL_DELAY_BLOCKS, COUNTERPARTY_CLAIMABLE_WITHIN_BLOCKS_PINNABLE, LATENCY_GRACE_PERIOD_BLOCKS};
use crate::chain::transaction::OutPoint;
use crate::chain::chaininterface::{ConfirmationTarget, LowerBoundedFeeEstimator, compute_feerate_sat_per_1000_weight};
use crate::events::bump_transaction::{BumpTransactionEvent};
use crate::events::bump_transaction::BumpTransactionEvent;
use crate::events::{Event, ClosureReason, HTLCHandlingFailureType};
use crate::ln::channel;
use crate::ln::types::ChannelId;
Expand Down Expand Up @@ -586,7 +586,7 @@ fn do_test_claim_value_force_close(keyed_anchors: bool, p2a_anchor: bool, prev_c
expect_payment_sent(&nodes[0], payment_preimage, None, false, false);
nodes[0].node.handle_commitment_signed_batch_test(nodes[1].node.get_our_node_id(), &b_htlc_msgs.commitment_signed);
check_added_monitors!(nodes[0], 1);
let (as_raa, as_cs) = get_revoke_commit_msgs!(nodes[0], nodes[1].node.get_our_node_id());
let (as_raa, as_cs) = get_revoke_commit_msgs(&nodes[0], &nodes[1].node.get_our_node_id());
nodes[1].node.handle_revoke_and_ack(nodes[0].node.get_our_node_id(), &as_raa);
let _htlc_updates = get_htlc_update_msgs!(&nodes[1], nodes[0].node.get_our_node_id());
check_added_monitors!(nodes[1], 1);
Expand Down Expand Up @@ -3655,7 +3655,7 @@ fn do_test_lost_timeout_monitor_events(confirm_tx: CommitmentType, dust_htlcs: b
nodes[2].node.handle_commitment_signed_batch_test(node_b_id, &updates.commitment_signed);
check_added_monitors(&nodes[2], 1);

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