Skip to content

Reduce macro usage in tests #2028

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 10 commits into from
Mar 6, 2023
Merged

Reduce macro usage in tests #2028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4bb14ad
Replace `check_added_monitors` with a function
TheBlueMatt Feb 10, 2023
aefe276
Replace `get_payment_preimage_hash` with a function
TheBlueMatt Feb 10, 2023
b5912ec
Replace `get_route` macro with a function
TheBlueMatt Feb 10, 2023
90b2f5e
Replace `get_revoke_commit_msgs` macro with a function
TheBlueMatt Feb 10, 2023
35bb0f4
Replace `get_err_msg` macro with a function
TheBlueMatt Feb 10, 2023
8c6e132
Replace `get_htlc_update_msgs` macro with a function
TheBlueMatt Feb 10, 2023
871aec2
Move parts of the `check_spends` macro into a function
TheBlueMatt Feb 10, 2023
8bf5eda
Replace `check_closed_broadcast` macro with a function
TheBlueMatt Feb 10, 2023
226c43c
Replace `check_closed_event` macro with a function
TheBlueMatt Feb 10, 2023
0512260
Reduce macro contents in `expect_pending_htlcs_forwardable*` macros
TheBlueMatt Feb 10, 2023
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
16 changes: 8 additions & 8 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8469,7 +8469,7 @@ mod tests {
// A MAX_UNFUNDED_CHANS_PER_PEER + 1 channel will be summarily rejected
open_channel_msg.temporary_channel_id = nodes[0].keys_manager.get_secure_random_bytes();
nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), &open_channel_msg);
assert_eq!(get_err_msg!(nodes[1], nodes[0].node.get_our_node_id()).channel_id,
assert_eq!(get_err_msg(&nodes[1], &nodes[0].node.get_our_node_id()).channel_id,
open_channel_msg.temporary_channel_id);

// Further, because all of our channels with nodes[0] are inbound, and none of them funded,
Expand Down Expand Up @@ -8516,7 +8516,7 @@ mod tests {
open_channel_msg.temporary_channel_id = nodes[0].keys_manager.get_secure_random_bytes();
}
nodes[1].node.handle_open_channel(&last_random_pk, &open_channel_msg);
assert_eq!(get_err_msg!(nodes[1], last_random_pk).channel_id,
assert_eq!(get_err_msg(&nodes[1], &last_random_pk).channel_id,
open_channel_msg.temporary_channel_id);

// Of course, however, outbound channels are always allowed
Expand Down Expand Up @@ -8558,7 +8558,7 @@ mod tests {
// Once we have MAX_UNFUNDED_CHANS_PER_PEER unfunded channels, new inbound channels will be
// rejected.
nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), &open_channel_msg);
assert_eq!(get_err_msg!(nodes[1], nodes[0].node.get_our_node_id()).channel_id,
assert_eq!(get_err_msg(&nodes[1], &nodes[0].node.get_our_node_id()).channel_id,
open_channel_msg.temporary_channel_id);

// but we can still open an outbound channel.
Expand All @@ -8567,7 +8567,7 @@ mod tests {

// but even with such an outbound channel, additional inbound channels will still fail.
nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), &open_channel_msg);
assert_eq!(get_err_msg!(nodes[1], nodes[0].node.get_our_node_id()).channel_id,
assert_eq!(get_err_msg(&nodes[1], &nodes[0].node.get_our_node_id()).channel_id,
open_channel_msg.temporary_channel_id);
}

Expand Down Expand Up @@ -8623,7 +8623,7 @@ mod tests {
}
_ => panic!("Unexpected event"),
}
assert_eq!(get_err_msg!(nodes[1], last_random_pk).channel_id,
assert_eq!(get_err_msg(&nodes[1], &last_random_pk).channel_id,
open_channel_msg.temporary_channel_id);

// ...however if we accept the same channel 0conf it should work just fine.
Expand Down Expand Up @@ -8665,7 +8665,7 @@ mod tests {
_ => panic!("Unexpected event"),
}

let error_msg = get_err_msg!(nodes[1], nodes[0].node.get_our_node_id());
let error_msg = get_err_msg(&nodes[1], &nodes[0].node.get_our_node_id());
nodes[0].node.handle_error(&nodes[1].node.get_our_node_id(), &error_msg);

let open_channel_msg = get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id());
Expand Down Expand Up @@ -8831,7 +8831,7 @@ pub mod bench {
let payment_event = SendEvent::from_event($node_a.get_and_clear_pending_msg_events().pop().unwrap());
$node_b.handle_update_add_htlc(&$node_a.get_our_node_id(), &payment_event.msgs[0]);
$node_b.handle_commitment_signed(&$node_a.get_our_node_id(), &payment_event.commitment_msg);
let (raa, cs) = get_revoke_commit_msgs!(NodeHolder { node: &$node_b }, $node_a.get_our_node_id());
let (raa, cs) = do_get_revoke_commit_msgs!(NodeHolder { node: &$node_b }, &$node_a.get_our_node_id());
$node_a.handle_revoke_and_ack(&$node_b.get_our_node_id(), &raa);
$node_a.handle_commitment_signed(&$node_b.get_our_node_id(), &cs);
$node_b.handle_revoke_and_ack(&$node_a.get_our_node_id(), &get_event_msg!(NodeHolder { node: &$node_a }, MessageSendEvent::SendRevokeAndACK, $node_b.get_our_node_id()));
Expand All @@ -8850,7 +8850,7 @@ pub mod bench {
_ => panic!("Failed to generate claim event"),
}

let (raa, cs) = get_revoke_commit_msgs!(NodeHolder { node: &$node_a }, $node_b.get_our_node_id());
let (raa, cs) = do_get_revoke_commit_msgs!(NodeHolder { node: &$node_a }, &$node_b.get_our_node_id());
$node_b.handle_revoke_and_ack(&$node_a.get_our_node_id(), &raa);
$node_b.handle_commitment_signed(&$node_a.get_our_node_id(), &cs);
$node_a.handle_revoke_and_ack(&$node_b.get_our_node_id(), &get_event_msg!(NodeHolder { node: &$node_b }, MessageSendEvent::SendRevokeAndACK, $node_a.get_our_node_id()));
Expand Down
Loading