Skip to content

Commit 149a574

Browse files
tnulltnull
committed
f Make expect_channel_ready_event a function
1 parent 0d43e5f commit 149a574

File tree

6 files changed

+47
-49
lines changed

6 files changed

+47
-49
lines changed

‎lightning-invoice/src/utils.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -869,8 +869,8 @@ mod test {
869869
get_event_msg!(nodes[2], MessageSendEvent::SendChannelUpdate, nodes[0].node.get_our_node_id());
870870
nodes[0].node.handle_channel_ready(&nodes[2].node.get_our_node_id(), &as_channel_ready);
871871
get_event_msg!(nodes[0], MessageSendEvent::SendChannelUpdate, nodes[2].node.get_our_node_id());
872-
expect_channel_ready_event!(nodes[0], nodes[2].node.get_our_node_id());
873-
expect_channel_ready_event!(nodes[2], nodes[0].node.get_our_node_id());
872+
expect_channel_ready_event(&nodes[0], &nodes[2].node.get_our_node_id());
873+
expect_channel_ready_event(&nodes[2], &nodes[0].node.get_our_node_id());
874874

875875
// As `msgs::ChannelUpdate` was never handled for the participating node(s) of the second
876876
// channel, the channel will never be assigned any `counterparty.forwarding_info`.
@@ -1259,8 +1259,8 @@ mod test {
12591259
get_event_msg!(nodes[1], MessageSendEvent::SendChannelUpdate, nodes[3].node.get_our_node_id());
12601260
nodes[3].node.handle_channel_ready(&nodes[1].node.get_our_node_id(), &as_channel_ready);
12611261
get_event_msg!(nodes[3], MessageSendEvent::SendChannelUpdate, nodes[1].node.get_our_node_id());
1262-
expect_channel_ready_event!(nodes[1], nodes[3].node.get_our_node_id());
1263-
expect_channel_ready_event!(nodes[3], nodes[1].node.get_our_node_id());
1262+
expect_channel_ready_event(&nodes[1], &nodes[3].node.get_our_node_id());
1263+
expect_channel_ready_event(&nodes[3], &nodes[1].node.get_our_node_id());
12641264

12651265
// As `msgs::ChannelUpdate` was never handled for the participating node(s) of the third
12661266
// channel, the channel will never be assigned any `counterparty.forwarding_info`.

‎lightning/src/ln/chanmon_update_fail_tests.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1915,8 +1915,8 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:
19151915
node.gossip_sync.handle_channel_update(&as_update).unwrap();
19161916
node.gossip_sync.handle_channel_update(&bs_update).unwrap();
19171917
}
1918-
expect_channel_ready_event!(nodes[1], nodes[0].node.get_our_node_id());
1919-
expect_channel_ready_event!(nodes[0], nodes[1].node.get_our_node_id());
1918+
expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
1919+
expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
19201920

19211921
send_payment(&nodes[0], &[&nodes[1]], 8000000);
19221922
close_channel(&nodes[0], &nodes[1], &channel_id, funding_tx, true);

‎lightning/src/ln/channelmanager.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7836,8 +7836,8 @@ mod tests {
78367836
let (channel_ready, _) = create_chan_between_nodes_with_value_confirm(&nodes[0], &nodes[1], &tx);
78377837
let (announcement, nodes_0_update, nodes_1_update) = create_chan_between_nodes_with_value_b(&nodes[0], &nodes[1], &channel_ready);
78387838
update_nodes_with_chan_announce(&nodes, 0, 1, &announcement, &nodes_0_update, &nodes_1_update);
7839-
expect_channel_ready_event!(nodes[0], nodes[1].node.get_our_node_id());
7840-
expect_channel_ready_event!(nodes[1], nodes[0].node.get_our_node_id());
7839+
expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
7840+
expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
78417841

78427842

78437843
nodes[0].node.close_channel(channel_id, &nodes[1].node.get_our_node_id()).unwrap();

‎lightning/src/ln/functional_test_utils.rs‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -407,26 +407,11 @@ pub fn create_chan_between_nodes<'a, 'b, 'c, 'd>(node_a: &'a Node<'b, 'c, 'd>, n
407407
create_chan_between_nodes_with_value(node_a, node_b, 100000, 10001, a_flags, b_flags)
408408
}
409409

410-
#[macro_export]
411-
#[cfg(any(test, feature = "_bench_unstable", feature = "_test_utils"))]
412-
macro_rules! expect_channel_ready_event {
413-
($node: expr, $expected_counterparty_node_id: expr) => {
414-
let events = $node.node.get_and_clear_pending_events();
415-
assert_eq!(events.len(), 1);
416-
match events[0] {
417-
$crate::util::events::Event::ChannelReady{ ref counterparty_node_id, .. } => {
418-
assert_eq!($expected_counterparty_node_id, *counterparty_node_id);
419-
},
420-
_ => panic!("Unexpected event"),
421-
}
422-
}
423-
}
424-
425410
pub fn create_chan_between_nodes_with_value<'a, 'b, 'c, 'd>(node_a: &'a Node<'b, 'c, 'd>, node_b: &'a Node<'b, 'c, 'd>, channel_value: u64, push_msat: u64, a_flags: InitFeatures, b_flags: InitFeatures) -> (msgs::ChannelAnnouncement, msgs::ChannelUpdate, msgs::ChannelUpdate, [u8; 32], Transaction) {
426411
let (channel_ready, channel_id, tx) = create_chan_between_nodes_with_value_a(node_a, node_b, channel_value, push_msat, a_flags, b_flags);
427412
let (announcement, as_update, bs_update) = create_chan_between_nodes_with_value_b(node_a, node_b, &channel_ready);
428-
expect_channel_ready_event!(node_a, node_b.node.get_our_node_id());
429-
expect_channel_ready_event!(node_b, node_a.node.get_our_node_id());
413+
expect_channel_ready_event(&node_a, &node_b.node.get_our_node_id());
414+
expect_channel_ready_event(&node_b, &node_a.node.get_our_node_id());
430415
(announcement, as_update, bs_update, channel_id, tx)
431416
}
432417

@@ -758,8 +743,8 @@ pub fn open_zero_conf_channel<'a, 'b, 'c, 'd>(initiator: &'a Node<'b, 'c, 'd>, r
758743
assert_eq!(initiator.node.list_usable_channels().len(), initiator_channels + 1);
759744
assert_eq!(receiver.node.list_usable_channels().len(), receiver_channels + 1);
760745

761-
expect_channel_ready_event!(initiator, receiver.node.get_our_node_id());
762-
expect_channel_ready_event!(receiver, initiator.node.get_our_node_id());
746+
expect_channel_ready_event(&initiator, &receiver.node.get_our_node_id());
747+
expect_channel_ready_event(&receiver, &initiator.node.get_our_node_id());
763748

764749
(tx, as_channel_ready.channel_id)
765750
}
@@ -890,10 +875,10 @@ pub fn create_unannounced_chan_between_nodes_with_value<'a, 'b, 'c, 'd>(nodes: &
890875
connect_blocks(&nodes[b], CHAN_CONFIRM_DEPTH - 1);
891876
let as_channel_ready = get_event_msg!(nodes[a], MessageSendEvent::SendChannelReady, nodes[b].node.get_our_node_id());
892877
nodes[a].node.handle_channel_ready(&nodes[b].node.get_our_node_id(), &get_event_msg!(nodes[b], MessageSendEvent::SendChannelReady, nodes[a].node.get_our_node_id()));
893-
expect_channel_ready_event!(nodes[a], nodes[b].node.get_our_node_id());
878+
expect_channel_ready_event(&nodes[a], &nodes[b].node.get_our_node_id());
894879
let as_update = get_event_msg!(nodes[a], MessageSendEvent::SendChannelUpdate, nodes[b].node.get_our_node_id());
895880
nodes[b].node.handle_channel_ready(&nodes[a].node.get_our_node_id(), &as_channel_ready);
896-
expect_channel_ready_event!(nodes[b], nodes[a].node.get_our_node_id());
881+
expect_channel_ready_event(&nodes[b], &nodes[a].node.get_our_node_id());
897882
let bs_update = get_event_msg!(nodes[b], MessageSendEvent::SendChannelUpdate, nodes[a].node.get_our_node_id());
898883

899884
nodes[a].node.handle_channel_update(&nodes[b].node.get_our_node_id(), &bs_update);
@@ -1525,6 +1510,19 @@ macro_rules! expect_payment_forwarded {
15251510
}
15261511
}
15271512

1513+
#[cfg(any(test, feature = "_bench_unstable", feature = "_test_utils"))]
1514+
pub fn expect_channel_ready_event<'a, 'b, 'c, 'd>(node: &'a Node<'b, 'c, 'd>, expected_counterparty_node_id: &PublicKey) {
1515+
let events = node.node.get_and_clear_pending_events();
1516+
assert_eq!(events.len(), 1);
1517+
match events[0] {
1518+
crate::util::events::Event::ChannelReady{ ref counterparty_node_id, .. } => {
1519+
assert_eq!(*expected_counterparty_node_id, *counterparty_node_id);
1520+
},
1521+
_ => panic!("Unexpected event"),
1522+
}
1523+
}
1524+
1525+
15281526
pub struct PaymentFailedConditions<'a> {
15291527
pub(crate) expected_htlc_error_data: Option<(u16, &'a [u8])>,
15301528
pub(crate) expected_blamed_scid: Option<u64>,

‎lightning/src/ln/functional_tests.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ fn do_test_counterparty_no_reserve(send_from_initiator: bool) {
184184
let funding_tx = sign_funding_transaction(&nodes[0], &nodes[1], 100_000, temp_channel_id);
185185
let funding_msgs = create_chan_between_nodes_with_value_confirm(&nodes[0], &nodes[1], &funding_tx);
186186
create_chan_between_nodes_with_value_b(&nodes[0], &nodes[1], &funding_msgs.0);
187-
expect_channel_ready_event!(nodes[0], nodes[1].node.get_our_node_id());
188-
expect_channel_ready_event!(nodes[1], nodes[0].node.get_our_node_id());
187+
expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
188+
expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
189189

190190
// nodes[0] should now be able to send the full balance to nodes[1], violating nodes[1]'s
191191
// security model if it ever tries to send funds back to nodes[0] (but that's not our problem).
@@ -560,7 +560,7 @@ fn do_test_sanity_on_in_flight_opens(steps: u8) {
560560
confirm_transaction_at(&nodes[0], &tx, 2);
561561
connect_blocks(&nodes[0], CHAN_CONFIRM_DEPTH);
562562
create_chan_between_nodes_with_value_confirm_second(&nodes[1], &nodes[0]);
563-
expect_channel_ready_event!(nodes[0], nodes[1].node.get_our_node_id());
563+
expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
564564
}
565565

566566
#[test]
@@ -3715,7 +3715,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
37153715

37163716
let events_1 = nodes[1].node.get_and_clear_pending_events();
37173717
if messages_delivered == 0 {
3718-
expect_channel_ready_event!(nodes[0], nodes[1].node.get_our_node_id());
3718+
expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
37193719
assert_eq!(events_1.len(), 2);
37203720
match events_1[0] {
37213721
Event::ChannelReady { .. } => { },
@@ -3968,8 +3968,8 @@ fn test_funding_peer_disconnect() {
39683968
},
39693969
_ => panic!("Unexpected event {:?}", events_6[0]),
39703970
};
3971-
expect_channel_ready_event!(nodes[0], nodes[1].node.get_our_node_id());
3972-
expect_channel_ready_event!(nodes[1], nodes[0].node.get_our_node_id());
3971+
expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
3972+
expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
39733973

39743974
// When we deliver nodes[1]'s announcement_signatures to nodes[0], nodes[0] should immediately
39753975
// broadcast the channel announcement globally, as well as re-send its (now-public)
@@ -4432,8 +4432,8 @@ fn test_no_txn_manager_serialize_deserialize() {
44324432
node.gossip_sync.handle_channel_update(&as_update).unwrap();
44334433
node.gossip_sync.handle_channel_update(&bs_update).unwrap();
44344434
}
4435-
expect_channel_ready_event!(nodes[0], nodes[1].node.get_our_node_id());
4436-
expect_channel_ready_event!(nodes[1], nodes[0].node.get_our_node_id());
4435+
expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
4436+
expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
44374437

44384438
send_payment(&nodes[0], &[&nodes[1]], 1000000);
44394439
}
@@ -4555,8 +4555,8 @@ fn test_manager_serialize_deserialize_events() {
45554555
node.gossip_sync.handle_channel_update(&as_update).unwrap();
45564556
node.gossip_sync.handle_channel_update(&bs_update).unwrap();
45574557
}
4558-
expect_channel_ready_event!(nodes[0], nodes[1].node.get_our_node_id());
4559-
expect_channel_ready_event!(nodes[1], nodes[0].node.get_our_node_id());
4558+
expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
4559+
expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
45604560

45614561
send_payment(&nodes[0], &[&nodes[1]], 1000000);
45624562
}
@@ -9451,8 +9451,8 @@ fn test_duplicate_chan_id() {
94519451
let (channel_ready, _) = create_chan_between_nodes_with_value_confirm(&nodes[0], &nodes[1], &tx);
94529452
let (announcement, as_update, bs_update) = create_chan_between_nodes_with_value_b(&nodes[0], &nodes[1], &channel_ready);
94539453
update_nodes_with_chan_announce(&nodes, 0, 1, &announcement, &as_update, &bs_update);
9454-
expect_channel_ready_event!(nodes[0], nodes[1].node.get_our_node_id());
9455-
expect_channel_ready_event!(nodes[1], nodes[0].node.get_our_node_id());
9454+
expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
9455+
expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
94569456

94579457
send_payment(&nodes[0], &[&nodes[1]], 8000000);
94589458
}
@@ -10381,8 +10381,8 @@ fn do_test_max_dust_htlc_exposure(dust_outbound_balance: bool, exposure_breach_e
1038110381
let (channel_ready, channel_id) = create_chan_between_nodes_with_value_confirm(&nodes[0], &nodes[1], &tx);
1038210382
let (announcement, as_update, bs_update) = create_chan_between_nodes_with_value_b(&nodes[0], &nodes[1], &channel_ready);
1038310383
update_nodes_with_chan_announce(&nodes, 0, 1, &announcement, &as_update, &bs_update);
10384-
expect_channel_ready_event!(nodes[0], nodes[1].node.get_our_node_id());
10385-
expect_channel_ready_event!(nodes[1], nodes[0].node.get_our_node_id());
10384+
expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
10385+
expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
1038610386

1038710387
let dust_buffer_feerate = {
1038810388
let chan_lock = nodes[0].node.channel_state.lock().unwrap();

‎lightning/src/ln/priv_short_conf_tests.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ fn do_test_1_conf_open(connect_style: ConnectStyle) {
202202
} else { panic!("Unexpected event"); }
203203

204204
nodes[1].node.handle_channel_ready(&nodes[0].node.get_our_node_id(), &as_channel_ready);
205-
expect_channel_ready_event!(nodes[0], nodes[1].node.get_our_node_id());
206-
expect_channel_ready_event!(nodes[1], nodes[0].node.get_our_node_id());
205+
expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
206+
expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
207207
let bs_msg_events = nodes[1].node.get_and_clear_pending_msg_events();
208208
assert_eq!(bs_msg_events.len(), 1);
209209
if let MessageSendEvent::SendChannelUpdate { ref node_id, msg: _ } = bs_msg_events[0] {
@@ -409,10 +409,10 @@ fn test_inbound_scid_privacy() {
409409
connect_blocks(&nodes[2], CHAN_CONFIRM_DEPTH - 1);
410410
let bs_channel_ready = get_event_msg!(nodes[1], MessageSendEvent::SendChannelReady, nodes[2].node.get_our_node_id());
411411
nodes[1].node.handle_channel_ready(&nodes[2].node.get_our_node_id(), &get_event_msg!(nodes[2], MessageSendEvent::SendChannelReady, nodes[1].node.get_our_node_id()));
412-
expect_channel_ready_event!(nodes[1], nodes[2].node.get_our_node_id());
412+
expect_channel_ready_event(&nodes[1], &nodes[2].node.get_our_node_id());
413413
let bs_update = get_event_msg!(nodes[1], MessageSendEvent::SendChannelUpdate, nodes[2].node.get_our_node_id());
414414
nodes[2].node.handle_channel_ready(&nodes[1].node.get_our_node_id(), &bs_channel_ready);
415-
expect_channel_ready_event!(nodes[2], nodes[1].node.get_our_node_id());
415+
expect_channel_ready_event(&nodes[2], &nodes[1].node.get_our_node_id());
416416
let cs_update = get_event_msg!(nodes[2], MessageSendEvent::SendChannelUpdate, nodes[1].node.get_our_node_id());
417417

418418
nodes[1].node.handle_channel_update(&nodes[2].node.get_our_node_id(), &cs_update);
@@ -676,8 +676,8 @@ fn test_0conf_channel_with_async_monitor() {
676676
}
677677
_ => panic!("Unexpected event"),
678678
}
679-
expect_channel_ready_event!(nodes[0], nodes[1].node.get_our_node_id());
680-
expect_channel_ready_event!(nodes[1], nodes[0].node.get_our_node_id());
679+
expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
680+
expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
681681

682682
let bs_channel_update = get_event_msg!(nodes[1], MessageSendEvent::SendChannelUpdate, nodes[0].node.get_our_node_id());
683683

0 commit comments

Comments
 (0)