Skip to content

Commit 67d666a

Browse files
elnoshclaude
elnosh
and
claude
committed
Replace get_closing_signed_broadcast! macro with direct function calls
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent bd73b94 commit 67d666a

5 files changed

Lines changed: 55 additions & 57 deletions

File tree

‎lightning/src/ln/async_signer_tests.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1308,9 +1308,9 @@ fn do_test_closing_signed(extra_closing_signed: bool, reconnect: bool) {
13081308
}
13091309

13101310
nodes[0].node.signer_unblocked(None);
1311-
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast!(nodes[0].node, node_b_id);
1311+
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast(&nodes[0], node_b_id);
13121312
nodes[1].node.handle_closing_signed(node_a_id, &node_0_2nd_closing_signed.unwrap());
1313-
let (_, node_1_closing_signed) = get_closing_signed_broadcast!(nodes[1].node, node_a_id);
1313+
let (_, node_1_closing_signed) = get_closing_signed_broadcast(&nodes[1], node_a_id);
13141314
assert!(node_1_closing_signed.is_none());
13151315

13161316
assert!(nodes[0].node.list_channels().is_empty());

‎lightning/src/ln/chanmon_update_fail_tests.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3048,11 +3048,11 @@ fn test_temporary_error_during_shutdown() {
30483048
node_b_id,
30493049
&get_event_msg!(nodes[1], MessageSendEvent::SendClosingSigned, node_a_id),
30503050
);
3051-
let (_, closing_signed_a) = get_closing_signed_broadcast!(nodes[0].node, node_b_id);
3051+
let (_, closing_signed_a) = get_closing_signed_broadcast(&nodes[0], node_b_id);
30523052
let txn_a = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0);
30533053

30543054
nodes[1].node.handle_closing_signed(node_a_id, &closing_signed_a.unwrap());
3055-
let (_, none_b) = get_closing_signed_broadcast!(nodes[1].node, node_a_id);
3055+
let (_, none_b) = get_closing_signed_broadcast(&nodes[1], node_a_id);
30563056
assert!(none_b.is_none());
30573057
let txn_b = nodes[1].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0);
30583058

‎lightning/src/ln/functional_test_utils.rs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2210,31 +2210,31 @@ macro_rules! check_spends {
22102210
}
22112211
}
22122212

2213-
macro_rules! get_closing_signed_broadcast {
2214-
($node: expr, $dest_pubkey: expr) => {{
2215-
let events = $node.get_and_clear_pending_msg_events();
2216-
assert!(events.len() == 1 || events.len() == 2);
2217-
(
2218-
match events[events.len() - 1] {
2219-
MessageSendEvent::BroadcastChannelUpdate { ref msg, .. } => {
2220-
assert_eq!(msg.contents.channel_flags & 2, 2);
2221-
msg.clone()
2213+
pub fn get_closing_signed_broadcast(
2214+
node: &Node, dest_pubkey: PublicKey,
2215+
) -> (msgs::ChannelUpdate, Option<msgs::ClosingSigned>) {
2216+
let events = node.node.get_and_clear_pending_msg_events();
2217+
assert!(events.len() == 1 || events.len() == 2);
2218+
(
2219+
match events[events.len() - 1] {
2220+
MessageSendEvent::BroadcastChannelUpdate { ref msg, .. } => {
2221+
assert_eq!(msg.contents.channel_flags & 2, 2);
2222+
msg.clone()
2223+
},
2224+
_ => panic!("Unexpected event"),
2225+
},
2226+
if events.len() == 2 {
2227+
match events[0] {
2228+
MessageSendEvent::SendClosingSigned { ref node_id, ref msg } => {
2229+
assert_eq!(*node_id, dest_pubkey);
2230+
Some(msg.clone())
22222231
},
22232232
_ => panic!("Unexpected event"),
2224-
},
2225-
if events.len() == 2 {
2226-
match events[0] {
2227-
MessageSendEvent::SendClosingSigned { ref node_id, ref msg } => {
2228-
assert_eq!(*node_id, $dest_pubkey);
2229-
Some(msg.clone())
2230-
},
2231-
_ => panic!("Unexpected event"),
2232-
}
2233-
} else {
2234-
None
2235-
},
2236-
)
2237-
}};
2233+
}
2234+
} else {
2235+
None
2236+
},
2237+
)
22382238
}
22392239

22402240
#[cfg(test)]
@@ -2519,10 +2519,10 @@ pub fn close_channel<'a, 'b, 'c>(
25192519
assert_eq!(broadcaster_b.txn_broadcasted.lock().unwrap().len(), 1);
25202520
tx_b = broadcaster_b.txn_broadcasted.lock().unwrap().remove(0);
25212521
let (bs_update, closing_signed_b) =
2522-
get_closing_signed_broadcast!(node_b, node_a.get_our_node_id());
2522+
get_closing_signed_broadcast(struct_b, node_a.get_our_node_id());
25232523

25242524
node_a.handle_closing_signed(node_b.get_our_node_id(), &closing_signed_b.unwrap());
2525-
let (as_update, none_a) = get_closing_signed_broadcast!(node_a, node_b.get_our_node_id());
2525+
let (as_update, none_a) = get_closing_signed_broadcast(struct_a, node_b.get_our_node_id());
25262526
assert!(none_a.is_none());
25272527
assert_eq!(broadcaster_a.txn_broadcasted.lock().unwrap().len(), 1);
25282528
tx_a = broadcaster_a.txn_broadcasted.lock().unwrap().remove(0);
@@ -2539,10 +2539,10 @@ pub fn close_channel<'a, 'b, 'c>(
25392539
assert_eq!(broadcaster_a.txn_broadcasted.lock().unwrap().len(), 1);
25402540
tx_a = broadcaster_a.txn_broadcasted.lock().unwrap().remove(0);
25412541
let (as_update, closing_signed_a) =
2542-
get_closing_signed_broadcast!(node_a, node_b.get_our_node_id());
2542+
get_closing_signed_broadcast(struct_a, node_b.get_our_node_id());
25432543

25442544
node_b.handle_closing_signed(node_a.get_our_node_id(), &closing_signed_a.unwrap());
2545-
let (bs_update, none_b) = get_closing_signed_broadcast!(node_b, node_a.get_our_node_id());
2545+
let (bs_update, none_b) = get_closing_signed_broadcast(struct_b, node_a.get_our_node_id());
25462546
assert!(none_b.is_none());
25472547
assert_eq!(broadcaster_b.txn_broadcasted.lock().unwrap().len(), 1);
25482548
tx_b = broadcaster_b.txn_broadcasted.lock().unwrap().remove(0);

‎lightning/src/ln/monitor_tests.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,9 +369,9 @@ fn do_chanmon_claim_value_coop_close(keyed_anchors: bool, p2a_anchor: bool) {
369369
nodes[1].node.handle_closing_signed(nodes[0].node.get_our_node_id(), &node_0_closing_signed);
370370
let node_1_closing_signed = get_event_msg!(nodes[1], MessageSendEvent::SendClosingSigned, nodes[0].node.get_our_node_id());
371371
nodes[0].node.handle_closing_signed(nodes[1].node.get_our_node_id(), &node_1_closing_signed);
372-
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast!(nodes[0].node, nodes[1].node.get_our_node_id());
372+
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast(&nodes[0], nodes[1].node.get_our_node_id());
373373
nodes[1].node.handle_closing_signed(nodes[0].node.get_our_node_id(), &node_0_2nd_closing_signed.unwrap());
374-
let (_, node_1_none) = get_closing_signed_broadcast!(nodes[1].node, nodes[0].node.get_our_node_id());
374+
let (_, node_1_none) = get_closing_signed_broadcast(&nodes[1], nodes[0].node.get_our_node_id());
375375
assert!(node_1_none.is_none());
376376

377377
let shutdown_tx = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0);

‎lightning/src/ln/shutdown_tests.rs‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ fn pre_funding_lock_shutdown_test() {
7171
let node_1_closing_signed =
7272
get_event_msg!(nodes[1], MessageSendEvent::SendClosingSigned, node_a_id);
7373
nodes[0].node.handle_closing_signed(node_b_id, &node_1_closing_signed);
74-
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast!(nodes[0].node, node_b_id);
74+
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast(&nodes[0], node_b_id);
7575
nodes[1].node.handle_closing_signed(node_a_id, &node_0_2nd_closing_signed.unwrap());
76-
let (_, node_1_none) = get_closing_signed_broadcast!(nodes[1].node, node_a_id);
76+
let (_, node_1_none) = get_closing_signed_broadcast(&nodes[1], node_a_id);
7777
assert!(node_1_none.is_none());
7878

7979
assert!(nodes[0].node.list_channels().is_empty());
@@ -122,9 +122,9 @@ fn expect_channel_shutdown_state() {
122122
let node_1_closing_signed =
123123
get_event_msg!(nodes[1], MessageSendEvent::SendClosingSigned, node_a_id);
124124
nodes[0].node.handle_closing_signed(node_b_id, &node_1_closing_signed);
125-
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast!(nodes[0].node, node_b_id);
125+
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast(&nodes[0], node_b_id);
126126
nodes[1].node.handle_closing_signed(node_a_id, &node_0_2nd_closing_signed.unwrap());
127-
let (_, node_1_none) = get_closing_signed_broadcast!(nodes[1].node, node_a_id);
127+
let (_, node_1_none) = get_closing_signed_broadcast(&nodes[1], node_a_id);
128128
assert!(node_1_none.is_none());
129129

130130
assert!(nodes[0].node.list_channels().is_empty());
@@ -216,9 +216,9 @@ fn expect_channel_shutdown_state_with_htlc() {
216216
let node_1_closing_signed =
217217
get_event_msg!(nodes[1], MessageSendEvent::SendClosingSigned, node_a_id);
218218
nodes[0].node.handle_closing_signed(node_b_id, &node_1_closing_signed);
219-
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast!(nodes[0].node, node_b_id);
219+
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast(&nodes[0], node_b_id);
220220
nodes[1].node.handle_closing_signed(node_a_id, &node_0_2nd_closing_signed.unwrap());
221-
let (_, node_1_none) = get_closing_signed_broadcast!(nodes[1].node, node_a_id);
221+
let (_, node_1_none) = get_closing_signed_broadcast(&nodes[1], node_a_id);
222222
assert!(node_1_none.is_none());
223223
let reason_a = ClosureReason::LocallyInitiatedCooperativeClosure;
224224
check_closed_event(&nodes[0], 1, reason_a, &[node_b_id], 100000);
@@ -284,9 +284,9 @@ fn test_lnd_bug_6039() {
284284
let node_1_closing_signed =
285285
get_event_msg!(nodes[1], MessageSendEvent::SendClosingSigned, node_a_id);
286286
nodes[0].node.handle_closing_signed(node_b_id, &node_1_closing_signed);
287-
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast!(nodes[0].node, node_b_id);
287+
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast(&nodes[0], node_b_id);
288288
nodes[1].node.handle_closing_signed(node_a_id, &node_0_2nd_closing_signed.unwrap());
289-
let (_, node_1_none) = get_closing_signed_broadcast!(nodes[1].node, node_a_id);
289+
let (_, node_1_none) = get_closing_signed_broadcast(&nodes[1], node_a_id);
290290
assert!(node_1_none.is_none());
291291

292292
let reason_a = ClosureReason::LocallyInitiatedCooperativeClosure;
@@ -483,9 +483,9 @@ fn updates_shutdown_wait() {
483483
let node_1_closing_signed =
484484
get_event_msg!(nodes[1], MessageSendEvent::SendClosingSigned, node_a_id);
485485
nodes[0].node.handle_closing_signed(node_b_id, &node_1_closing_signed);
486-
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast!(nodes[0].node, node_b_id);
486+
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast(&nodes[0], node_b_id);
487487
nodes[1].node.handle_closing_signed(node_a_id, &node_0_2nd_closing_signed.unwrap());
488-
let (_, node_1_none) = get_closing_signed_broadcast!(nodes[1].node, node_a_id);
488+
let (_, node_1_none) = get_closing_signed_broadcast(&nodes[1], node_a_id);
489489
assert!(node_1_none.is_none());
490490

491491
let reason_a = ClosureReason::LocallyInitiatedCooperativeClosure;
@@ -618,9 +618,9 @@ fn do_htlc_fail_async_shutdown(blinded_recipient: bool) {
618618
let node_1_closing_signed =
619619
get_event_msg!(nodes[1], MessageSendEvent::SendClosingSigned, node_a_id);
620620
nodes[0].node.handle_closing_signed(node_b_id, &node_1_closing_signed);
621-
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast!(nodes[0].node, node_b_id);
621+
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast(&nodes[0], node_b_id);
622622
nodes[1].node.handle_closing_signed(node_a_id, &node_0_2nd_closing_signed.unwrap());
623-
let (_, node_1_none) = get_closing_signed_broadcast!(nodes[1].node, node_a_id);
623+
let (_, node_1_none) = get_closing_signed_broadcast(&nodes[1], node_a_id);
624624
assert!(node_1_none.is_none());
625625

626626
assert!(nodes[0].node.list_channels().is_empty());
@@ -750,8 +750,7 @@ fn do_test_shutdown_rebroadcast(recv_count: u8) {
750750
let node_1_closing_signed =
751751
get_event_msg!(nodes[1], MessageSendEvent::SendClosingSigned, node_a_id);
752752
nodes[0].node.handle_closing_signed(node_b_id, &node_1_closing_signed);
753-
let (_, node_0_2nd_closing_signed) =
754-
get_closing_signed_broadcast!(nodes[0].node, node_b_id);
753+
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast(&nodes[0], node_b_id);
755754
assert!(node_0_2nd_closing_signed.is_some());
756755
}
757756

@@ -799,10 +798,9 @@ fn do_test_shutdown_rebroadcast(recv_count: u8) {
799798
let node_1_closing_signed =
800799
get_event_msg!(nodes[1], MessageSendEvent::SendClosingSigned, node_a_id);
801800
nodes[0].node.handle_closing_signed(node_b_id, &node_1_closing_signed);
802-
let (_, node_0_2nd_closing_signed) =
803-
get_closing_signed_broadcast!(nodes[0].node, node_b_id);
801+
let (_, node_0_2nd_closing_signed) = get_closing_signed_broadcast(&nodes[0], node_b_id);
804802
nodes[1].node.handle_closing_signed(node_a_id, &node_0_2nd_closing_signed.unwrap());
805-
let (_, node_1_none) = get_closing_signed_broadcast!(nodes[1].node, node_a_id);
803+
let (_, node_1_none) = get_closing_signed_broadcast(&nodes[1], node_a_id);
806804
assert!(node_1_none.is_none());
807805
let reason = ClosureReason::LocallyInitiatedCooperativeClosure;
808806
check_closed_event(&nodes[1], 1, reason, &[node_a_id], 100000);
@@ -1388,7 +1386,7 @@ fn do_test_closing_signed_reinit_timeout(timeout_step: TimeoutStep) {
13881386
let node_1_closing_signed =
13891387
get_event_msg!(nodes[1], MessageSendEvent::SendClosingSigned, node_a_id);
13901388
nodes[0].node.handle_closing_signed(node_b_id, &node_1_closing_signed);
1391-
let node_0_2nd_closing_signed = get_closing_signed_broadcast!(nodes[0].node, node_b_id);
1389+
let node_0_2nd_closing_signed = get_closing_signed_broadcast(&nodes[0], node_b_id);
13921390
if timeout_step == TimeoutStep::NoTimeout {
13931391
nodes[1].node.handle_closing_signed(node_a_id, &node_0_2nd_closing_signed.1.unwrap());
13941392
let reason_b = ClosureReason::CounterpartyInitiatedCooperativeClosure;
@@ -1480,11 +1478,11 @@ fn do_simple_legacy_shutdown_test(high_initiator_fee: bool) {
14801478
}
14811479

14821480
nodes[1].node.handle_closing_signed(node_a_id, &node_0_closing_signed);
1483-
let (_, mut node_1_closing_signed) = get_closing_signed_broadcast!(nodes[1].node, node_a_id);
1481+
let (_, mut node_1_closing_signed) = get_closing_signed_broadcast(&nodes[1], node_a_id);
14841482
node_1_closing_signed.as_mut().unwrap().fee_range = None;
14851483

14861484
nodes[0].node.handle_closing_signed(node_b_id, &node_1_closing_signed.unwrap());
1487-
let (_, node_0_none) = get_closing_signed_broadcast!(nodes[0].node, node_b_id);
1485+
let (_, node_0_none) = get_closing_signed_broadcast(&nodes[0], node_b_id);
14881486
assert!(node_0_none.is_none());
14891487
let reason_a = ClosureReason::LocallyInitiatedCooperativeClosure;
14901488
check_closed_event(&nodes[0], 1, reason_a, &[node_b_id], 100000);
@@ -1528,7 +1526,7 @@ fn simple_target_feerate_shutdown() {
15281526
let node_0_closing_signed =
15291527
get_event_msg!(nodes[0], MessageSendEvent::SendClosingSigned, node_b_id);
15301528
nodes[1].node.handle_closing_signed(node_a_id, &node_0_closing_signed);
1531-
let (_, node_1_closing_signed_opt) = get_closing_signed_broadcast!(nodes[1].node, node_a_id);
1529+
let (_, node_1_closing_signed_opt) = get_closing_signed_broadcast(&nodes[1], node_a_id);
15321530
let node_1_closing_signed = node_1_closing_signed_opt.unwrap();
15331531

15341532
// nodes[1] was passed a target which was larger than the current channel feerate, which it
@@ -1558,7 +1556,7 @@ fn simple_target_feerate_shutdown() {
15581556
assert_eq!(node_0_closing_signed.fee_satoshis, node_1_closing_signed.fee_satoshis);
15591557

15601558
nodes[0].node.handle_closing_signed(node_b_id, &node_1_closing_signed);
1561-
let (_, node_0_none) = get_closing_signed_broadcast!(nodes[0].node, node_b_id);
1559+
let (_, node_0_none) = get_closing_signed_broadcast(&nodes[0], node_b_id);
15621560
assert!(node_0_none.is_none());
15631561
let reason_a = ClosureReason::LocallyInitiatedCooperativeClosure;
15641562
check_closed_event(&nodes[0], 1, reason_a, &[node_b_id], 100000);
@@ -1660,9 +1658,9 @@ fn do_outbound_update_no_early_closing_signed(use_htlc: bool) {
16601658
let bs_closing_signed =
16611659
get_event_msg!(nodes[1], MessageSendEvent::SendClosingSigned, node_a_id);
16621660
nodes[0].node.handle_closing_signed(node_b_id, &bs_closing_signed);
1663-
let (_, as_2nd_closing_signed) = get_closing_signed_broadcast!(nodes[0].node, node_b_id);
1661+
let (_, as_2nd_closing_signed) = get_closing_signed_broadcast(&nodes[0], node_b_id);
16641662
nodes[1].node.handle_closing_signed(node_a_id, &as_2nd_closing_signed.unwrap());
1665-
let (_, node_1_none) = get_closing_signed_broadcast!(nodes[1].node, node_a_id);
1663+
let (_, node_1_none) = get_closing_signed_broadcast(&nodes[1], node_a_id);
16661664
assert!(node_1_none.is_none());
16671665

16681666
let reason_a = ClosureReason::LocallyInitiatedCooperativeClosure;

0 commit comments

Comments
 (0)