Skip to content

Struct-ify reconnect_nodes test util args#2459

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
tnull merged 1 commit into from
Jul 31, 2023
Merged

Struct-ify reconnect_nodes test util args #2459

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
18 changes: 13 additions & 5 deletions lightning/src/ln/chanmon_update_fail_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -178,7 +178,9 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
if disconnect {
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
reconnect_args.send_channel_ready = (true, true);
reconnect_nodes(reconnect_args);
}

chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
Expand DownExpand Up@@ -233,7 +235,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
if disconnect {
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
}

// ...and make sure we can force-close a frozen channel
Expand DownExpand Up@@ -1925,7 +1927,9 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:
// Make sure nodes[1] isn't stupid enough to re-send the ChannelReady on reconnect
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
reconnect_nodes(&nodes[0], &nodes[1], (false, confirm_a_first), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
reconnect_args.send_channel_ready.1 = confirm_a_first;
reconnect_nodes(reconnect_args);

// But we want to re-emit ChannelPending
expect_channel_pending_event(&nodes[1], &nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -2575,10 +2579,14 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());

if second_fails {
reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (1, 0), (0, 0), (0, 0), (false, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
reconnect_args.pending_htlc_fails.0 = 1;
reconnect_nodes(reconnect_args);
expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
} else {
reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
reconnect_args.pending_htlc_claims.0 = 1;
reconnect_nodes(reconnect_args);
}

if htlc_status == HTLCStatusAtDupClaim::HoldingCell {
Expand Down
34 changes: 33 additions & 1 deletion lightning/src/ln/functional_test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2945,9 +2945,41 @@ macro_rules! handle_chan_reestablish_msgs {
}
}

pub struct ReconnectArgs<'a, 'b, 'c, 'd> {
pub node_a: &'a Node<'b, 'c, 'd>,
pub node_b: &'a Node<'b, 'c, 'd>,
pub send_channel_ready: (bool, bool),
pub pending_htlc_adds: (i64, i64),
pub pending_htlc_claims: (usize, usize),
pub pending_htlc_fails: (usize, usize),
pub pending_cell_htlc_claims: (usize, usize),
pub pending_cell_htlc_fails: (usize, usize),
pub pending_raa: (bool, bool),
}

impl<'a, 'b, 'c, 'd> ReconnectArgs<'a, 'b, 'c, 'd> {
pub fn new(node_a: &'a Node<'b, 'c, 'd>, node_b: &'a Node<'b, 'c, 'd>) -> Self {
Self {
node_a,
node_b,
send_channel_ready: (false, false),
pending_htlc_adds: (0, 0),
pending_htlc_claims: (0, 0),
pending_htlc_fails: (0, 0),
pending_cell_htlc_claims: (0, 0),
pending_cell_htlc_fails: (0, 0),
pending_raa: (false, false),
}
}
}

/// pending_htlc_adds includes both the holding cell and in-flight update_add_htlcs, whereas
/// for claims/fails they are separated out.
pub fn reconnect_nodes<'a, 'b, 'c>(node_a: &Node<'a, 'b, 'c>, node_b: &Node<'a, 'b, 'c>, send_channel_ready: (bool, bool), pending_htlc_adds: (i64, i64), pending_htlc_claims: (usize, usize), pending_htlc_fails: (usize, usize), pending_cell_htlc_claims: (usize, usize), pending_cell_htlc_fails: (usize, usize), pending_raa: (bool, bool)) {
pub fn reconnect_nodes<'a, 'b, 'c, 'd>(args: ReconnectArgs<'a, 'b, 'c, 'd>) {
let ReconnectArgs {
node_a, node_b, send_channel_ready, pending_htlc_adds, pending_htlc_claims, pending_htlc_fails,
pending_cell_htlc_claims, pending_cell_htlc_fails, pending_raa
} = args;
node_a.node.peer_connected(&node_b.node.get_our_node_id(), &msgs::Init {
features: node_b.node.init_features(), networks: None, remote_network_address: None
}, true).unwrap();
Expand Down
58 changes: 42 additions & 16 deletions lightning/src/ln/functional_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3585,7 +3585,9 @@ fn test_dup_events_on_peer_disconnect() {
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
reconnect_args.pending_htlc_claims.0 = 1;
reconnect_nodes(reconnect_args);
expect_payment_path_successful!(nodes[0]);
}

Expand DownExpand Up@@ -3642,7 +3644,9 @@ fn test_simple_peer_disconnect() {

nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
reconnect_args.send_channel_ready = (true, true);
reconnect_nodes(reconnect_args);

let payment_preimage_1 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
let payment_hash_2 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).1;
Expand All@@ -3651,7 +3655,7 @@ fn test_simple_peer_disconnect() {

nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

let (payment_preimage_3, payment_hash_3, _) = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000);
let payment_preimage_4 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
Expand All@@ -3664,7 +3668,10 @@ fn test_simple_peer_disconnect() {
claim_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], true, payment_preimage_3);
fail_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], true, payment_hash_5);

reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (1, 0), (1, 0), (false, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
reconnect_args.pending_cell_htlc_fails.0 = 1;
reconnect_args.pending_cell_htlc_claims.0 = 1;
reconnect_nodes(reconnect_args);
{
let events = nodes[0].node.get_and_clear_pending_events();
assert_eq!(events.len(), 4);
Expand DownExpand Up@@ -3776,19 +3783,29 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
}
// Even if the channel_ready messages get exchanged, as long as nothing further was
// received on either side, both sides will need to resend them.
reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 1), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
reconnect_args.send_channel_ready = (true, true);
reconnect_args.pending_htlc_adds.1 = 1;
reconnect_nodes(reconnect_args);
} else if messages_delivered == 3 {
// nodes[0] still wants its RAA + commitment_signed
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (-1, 0), (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
reconnect_args.pending_htlc_adds.0 = -1;
reconnect_args.pending_raa.0 = true;
reconnect_nodes(reconnect_args);
} else if messages_delivered == 4 {
// nodes[0] still wants its commitment_signed
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (-1, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
reconnect_args.pending_htlc_adds.0 = -1;
reconnect_nodes(reconnect_args);
} else if messages_delivered == 5 {
// nodes[1] still wants its final RAA
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
reconnect_args.pending_raa.1 = true;
reconnect_nodes(reconnect_args);
} else if messages_delivered == 6 {
// Everything was delivered...
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
}

let events_1 = nodes[1].node.get_and_clear_pending_events();
Expand All@@ -3812,7 +3829,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken

nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

nodes[1].node.process_pending_htlc_forwards();

Expand DownExpand Up@@ -3896,24 +3913,33 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
if messages_delivered < 2 {
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
reconnect_args.pending_htlc_claims.0 = 1;
reconnect_nodes(reconnect_args);
if messages_delivered < 1 {
expect_payment_sent!(nodes[0], payment_preimage_1);
} else {
assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
}
} else if messages_delivered == 2 {
// nodes[0] still wants its RAA + commitment_signed
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, -1), (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
reconnect_args.pending_htlc_adds.1 = -1;
reconnect_args.pending_raa.1 = true;
reconnect_nodes(reconnect_args);
} else if messages_delivered == 3 {
// nodes[0] still wants its commitment_signed
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, -1), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
reconnect_args.pending_htlc_adds.1 = -1;
reconnect_nodes(reconnect_args);
} else if messages_delivered == 4 {
// nodes[1] still wants its final RAA
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
reconnect_args.pending_raa.0 = true;
reconnect_nodes(reconnect_args);
} else if messages_delivered == 5 {
// Everything was delivered...
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
}

if messages_delivered == 1 || messages_delivered == 2 {
Expand All@@ -3923,7 +3949,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
}
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

if messages_delivered > 2 {
expect_payment_path_successful!(nodes[0]);
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/onion_route_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -597,7 +597,7 @@ fn test_onion_failure() {
nodes[1].node.get_and_clear_pending_msg_events();
nodes[2].node.get_and_clear_pending_msg_events();
}, true, Some(UPDATE|20), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[2]));

run_onion_failure_test("expiry_too_far", 0, &nodes, &route, &payment_hash, &payment_secret, |msg| {
let session_priv = SecretKey::from_slice(&[3; 32]).unwrap();
Expand Down
16 changes: 10 additions & 6 deletions lightning/src/ln/payment_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,7 +490,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
// nodes[1] now immediately fails the HTLC as the next-hop channel is disconnected
let _ = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[2]));

let as_commitment_tx = get_local_commitment_txn!(nodes[0], chan_id)[0].clone();
if confirm_before_reload {
Expand DownExpand Up@@ -789,7 +789,9 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
nodes[0].node.test_process_background_events();
check_added_monitors(&nodes[0], 1);

reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
reconnect_args.send_channel_ready = (true, true);
reconnect_nodes(reconnect_args);

// Now resend the payment, delivering the HTLC and actually claiming it this time. This ensures
// the payment is not (spuriously) listed as still pending.
Expand DownExpand Up@@ -817,7 +819,7 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
nodes[0].node.test_process_background_events();
check_added_monitors(&nodes[0], 1);

reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

match nodes[0].node.send_payment_with_route(&new_route, payment_hash, RecipientOnionFields::secret_only(payment_secret), payment_id) {
Err(PaymentSendFailure::DuplicatePayment) => {},
Expand DownExpand Up@@ -1011,7 +1013,7 @@ fn test_fulfill_restart_failure() {
reload_node!(nodes[1], &chan_manager_serialized, &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_1_deserialized);

nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

nodes[1].node.fail_htlc_backwards(&payment_hash);
expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::FailedPayment { payment_hash }]);
Expand DownExpand Up@@ -3422,9 +3424,11 @@ fn do_test_payment_metadata_consistency(do_reload: bool, do_modify: bool) {
reload_node!(nodes[3], config, &nodes[3].node.encode(), &[&mon_bd, &mon_cd],
persister, new_chain_monitor, nodes_0_deserialized);
nodes[1].node.peer_disconnected(&nodes[3].node.get_our_node_id());
reconnect_nodes(&nodes[1], &nodes[3], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[3]));
}
reconnect_nodes(&nodes[2], &nodes[3], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[2], &nodes[3]);
reconnect_args.send_channel_ready = (true, true);
reconnect_nodes(reconnect_args);

// Create a new channel between C and D as A will refuse to retry on the existing one because
// it just failed.
Expand Down
22 changes: 13 additions & 9 deletions lightning/src/ln/reload_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,9 @@ fn test_funding_peer_disconnect() {
let events_1 = nodes[0].node.get_and_clear_pending_msg_events();
assert!(events_1.is_empty());

reconnect_nodes(&nodes[0], &nodes[1], (false, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
reconnect_args.send_channel_ready.1 = true;
reconnect_nodes(reconnect_args);

nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -180,7 +182,7 @@ fn test_funding_peer_disconnect() {

reload_node!(nodes[0], &nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);

reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
}

#[test]
Expand DownExpand Up@@ -334,7 +336,7 @@ fn test_simple_manager_serialize_deserialize() {
let chan_0_monitor_serialized = get_monitor!(nodes[0], chan_id).encode();
reload_node!(nodes[0], nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);

reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

fail_payment(&nodes[0], &[&nodes[1]], our_payment_hash);
claim_payment(&nodes[0], &[&nodes[1]], our_payment_preimage);
Expand DownExpand Up@@ -456,8 +458,8 @@ fn test_manager_serialize_deserialize_inconsistent_monitor() {
check_added_monitors!(nodes[0], 1);

// nodes[1] and nodes[2] have no lost state with nodes[0]...
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(&nodes[0], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[2]));
//... and we can even still claim the payment!
claim_payment(&nodes[2], &[&nodes[0], &nodes[1]], our_payment_preimage);

Expand DownExpand Up@@ -666,10 +668,12 @@ fn test_forwardable_regen() {
let chan_1_monitor_serialized = get_monitor!(nodes[1], chan_id_2).encode();
reload_node!(nodes[1], nodes[1].node.encode(), &[&chan_0_monitor_serialized, &chan_1_monitor_serialized], persister, new_chain_monitor, nodes_1_deserialized);

reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
// Note that nodes[1] and nodes[2] resend their channel_ready here since they haven't updated
// the commitment state.
reconnect_nodes(&nodes[1], &nodes[2], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
reconnect_args.send_channel_ready = (true, true);
reconnect_nodes(reconnect_args);

assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

Expand DownExpand Up@@ -967,7 +971,7 @@ fn do_forwarded_payment_no_manager_persistence(use_cs_commitment: bool, claim_ht
check_added_monitors!(nodes[1], 1);

nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

if use_cs_commitment {
// If we confirm a commitment transaction that has the HTLC on-chain, nodes[1] should wait
Expand DownExpand Up@@ -1085,7 +1089,7 @@ fn removed_payment_no_manager_persistence() {
// now forgotten everywhere. The ChannelManager should have, as a side-effect of reload,
// learned that the HTLC is gone from the ChannelMonitor and added it to the to-fail-back set.
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], [HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
check_added_monitors!(nodes[1], 1);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Struct-ify `reconnect_nodes` test util args by valentinewallace · Pull Request #2459 · lightningdevkit/rust-lightning · GitHub
Skip to content
Struct-ify reconnect_nodes test util args#2459

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

tnull
merged 1 commit into

from

Jul 31, 2023
 Merged


Struct-ify reconnect_nodes test util args
#2459
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


18 changes: 13 additions & 5 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,7 +178,9 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.send_channel_ready = (true, true);
 reconnect_nodes(reconnect_args);
	}

	chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
Expand DownExpand Up@@ -233,7 +235,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	// ...and make sure we can force-close a frozen channel
Expand DownExpand Up@@ -1925,7 +1927,9 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:
	// Make sure nodes[1] isn't stupid enough to re-send the ChannelReady on reconnect
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, confirm_a_first), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready.1 = confirm_a_first;
	reconnect_nodes(reconnect_args);

	// But we want to re-emit ChannelPending
	expect_channel_pending_event(&nodes[1], &nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -2575,10 +2579,14 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
	nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	if second_fails {
 reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (1, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
 reconnect_args.pending_htlc_fails.0 = 1;
 reconnect_nodes(reconnect_args);
 expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
	} else {
 reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
 reconnect_args.pending_htlc_claims.0 = 1;
 reconnect_nodes(reconnect_args);
	}

	if htlc_status == HTLCStatusAtDupClaim::HoldingCell {
Expand Down

34 changes: 33 additions & 1 deletion
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2945,9 +2945,41 @@ macro_rules! handle_chan_reestablish_msgs {
	}
}

pub struct ReconnectArgs<'a, 'b, 'c, 'd> {
	pub node_a: &'a Node<'b, 'c, 'd>,
	pub node_b: &'a Node<'b, 'c, 'd>,
	pub send_channel_ready: (bool, bool),
	pub pending_htlc_adds: (i64, i64),
	pub pending_htlc_claims: (usize, usize),
	pub pending_htlc_fails: (usize, usize),
	pub pending_cell_htlc_claims: (usize, usize),
	pub pending_cell_htlc_fails: (usize, usize),
	pub pending_raa: (bool, bool),
}

impl<'a, 'b, 'c, 'd> ReconnectArgs<'a, 'b, 'c, 'd> {
	pub fn new(node_a: &'a Node<'b, 'c, 'd>, node_b: &'a Node<'b, 'c, 'd>) -> Self {
 Self {
 node_a,
 node_b,
 send_channel_ready: (false, false),
 pending_htlc_adds: (0, 0),
 pending_htlc_claims: (0, 0),
 pending_htlc_fails: (0, 0),
 pending_cell_htlc_claims: (0, 0),
 pending_cell_htlc_fails: (0, 0),
 pending_raa: (false, false),
 }
	}
}

/// pending_htlc_adds includes both the holding cell and in-flight update_add_htlcs, whereas
/// for claims/fails they are separated out.
pub fn reconnect_nodes<'a, 'b, 'c>(node_a: &Node<'a, 'b, 'c>, node_b: &Node<'a, 'b, 'c>, send_channel_ready: (bool, bool), pending_htlc_adds: (i64, i64), pending_htlc_claims: (usize, usize), pending_htlc_fails: (usize, usize), pending_cell_htlc_claims: (usize, usize), pending_cell_htlc_fails: (usize, usize), pending_raa: (bool, bool)) {
pub fn reconnect_nodes<'a, 'b, 'c, 'd>(args: ReconnectArgs<'a, 'b, 'c, 'd>) {
	let ReconnectArgs {
 node_a, node_b, send_channel_ready, pending_htlc_adds, pending_htlc_claims, pending_htlc_fails,
 pending_cell_htlc_claims, pending_cell_htlc_fails, pending_raa
	} = args;
	node_a.node.peer_connected(&node_b.node.get_our_node_id(), &msgs::Init {
 features: node_b.node.init_features(), networks: None, remote_network_address: None
	}, true).unwrap();
Expand Down

58 changes: 42 additions & 16 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3585,7 +3585,9 @@ fn test_dup_events_on_peer_disconnect() {
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.pending_htlc_claims.0 = 1;
	reconnect_nodes(reconnect_args);
	expect_payment_path_successful!(nodes[0]);
}

Expand DownExpand Up@@ -3642,7 +3644,9 @@ fn test_simple_peer_disconnect() {

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	let payment_preimage_1 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
	let payment_hash_2 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).1;
Expand All@@ -3651,7 +3655,7 @@ fn test_simple_peer_disconnect() {

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	let (payment_preimage_3, payment_hash_3, _) = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000);
	let payment_preimage_4 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
Expand All@@ -3664,7 +3668,10 @@ fn test_simple_peer_disconnect() {
	claim_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], true, payment_preimage_3);
	fail_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], true, payment_hash_5);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (1, 0), (1, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.pending_cell_htlc_fails.0 = 1;
	reconnect_args.pending_cell_htlc_claims.0 = 1;
	reconnect_nodes(reconnect_args);
	{
 let events = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events.len(), 4);
Expand DownExpand Up@@ -3776,19 +3783,29 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
 }
 // Even if the channel_ready messages get exchanged, as long as nothing further was
 // received on either side, both sides will need to resend them.
 reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 1), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.send_channel_ready = (true, true);
 reconnect_args.pending_htlc_adds.1 = 1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 3 {
 // nodes[0] still wants its RAA + commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (-1, 0), (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.0 = -1;
 reconnect_args.pending_raa.0 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 4 {
 // nodes[0] still wants its commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (-1, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.0 = -1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 5 {
 // nodes[1] still wants its final RAA
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_raa.1 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 6 {
 // Everything was delivered...
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	let events_1 = nodes[1].node.get_and_clear_pending_events();
Expand All@@ -3812,7 +3829,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	nodes[1].node.process_pending_htlc_forwards();

Expand DownExpand Up@@ -3896,24 +3913,33 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	if messages_delivered < 2 {
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_claims.0 = 1;
 reconnect_nodes(reconnect_args);
 if messages_delivered < 1 {
 expect_payment_sent!(nodes[0], payment_preimage_1);
 } else {
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 }
	} else if messages_delivered == 2 {
 // nodes[0] still wants its RAA + commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, -1), (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.1 = -1;
 reconnect_args.pending_raa.1 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 3 {
 // nodes[0] still wants its commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, -1), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.1 = -1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 4 {
 // nodes[1] still wants its final RAA
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_raa.0 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 5 {
 // Everything was delivered...
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	if messages_delivered == 1 || messages_delivered == 2 {
Expand All@@ -3923,7 +3949,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	}
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	if messages_delivered > 2 {
 expect_payment_path_successful!(nodes[0]);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -597,7 +597,7 @@ fn test_onion_failure() {
 nodes[1].node.get_and_clear_pending_msg_events();
 nodes[2].node.get_and_clear_pending_msg_events();
	}, true, Some(UPDATE|20), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[2]));

	run_onion_failure_test("expiry_too_far", 0, &nodes, &route, &payment_hash, &payment_secret, |msg| {
 let session_priv = SecretKey::from_slice(&[3; 32]).unwrap();
Expand Down

16 changes: 10 additions & 6 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -490,7 +490,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
	// nodes[1] now immediately fails the HTLC as the next-hop channel is disconnected
	let _ = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[2]));

	let as_commitment_tx = get_local_commitment_txn!(nodes[0], chan_id)[0].clone();
	if confirm_before_reload {
Expand DownExpand Up@@ -789,7 +789,9 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
	nodes[0].node.test_process_background_events();
	check_added_monitors(&nodes[0], 1);

	reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	// Now resend the payment, delivering the HTLC and actually claiming it this time. This ensures
	// the payment is not (spuriously) listed as still pending.
Expand DownExpand Up@@ -817,7 +819,7 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
	nodes[0].node.test_process_background_events();
	check_added_monitors(&nodes[0], 1);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	match nodes[0].node.send_payment_with_route(&new_route, payment_hash, RecipientOnionFields::secret_only(payment_secret), payment_id) {
 Err(PaymentSendFailure::DuplicatePayment) => {},
Expand DownExpand Up@@ -1011,7 +1013,7 @@ fn test_fulfill_restart_failure() {
	reload_node!(nodes[1], &chan_manager_serialized, &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_1_deserialized);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	nodes[1].node.fail_htlc_backwards(&payment_hash);
	expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::FailedPayment { payment_hash }]);
Expand DownExpand Up@@ -3422,9 +3424,11 @@ fn do_test_payment_metadata_consistency(do_reload: bool, do_modify: bool) {
 reload_node!(nodes[3], config, &nodes[3].node.encode(), &[&mon_bd, &mon_cd],
 persister, new_chain_monitor, nodes_0_deserialized);
 nodes[1].node.peer_disconnected(&nodes[3].node.get_our_node_id());
 reconnect_nodes(&nodes[1], &nodes[3], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[3]));
	}
	reconnect_nodes(&nodes[2], &nodes[3], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[2], &nodes[3]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	// Create a new channel between C and D as A will refuse to retry on the existing one because
	// it just failed.
Expand Down

22 changes: 13 additions & 9 deletions
lightning/src/ln/reload_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,9 @@ fn test_funding_peer_disconnect() {
	let events_1 = nodes[0].node.get_and_clear_pending_msg_events();
	assert!(events_1.is_empty());

	reconnect_nodes(&nodes[0], &nodes[1], (false, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready.1 = true;
	reconnect_nodes(reconnect_args);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -180,7 +182,7 @@ fn test_funding_peer_disconnect() {

	reload_node!(nodes[0], &nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
}

#[test]
Expand DownExpand Up@@ -334,7 +336,7 @@ fn test_simple_manager_serialize_deserialize() {
	let chan_0_monitor_serialized = get_monitor!(nodes[0], chan_id).encode();
	reload_node!(nodes[0], nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	fail_payment(&nodes[0], &[&nodes[1]], our_payment_hash);
	claim_payment(&nodes[0], &[&nodes[1]], our_payment_preimage);
Expand DownExpand Up@@ -456,8 +458,8 @@ fn test_manager_serialize_deserialize_inconsistent_monitor() {
	check_added_monitors!(nodes[0], 1);

	// nodes[1] and nodes[2] have no lost state with nodes[0]...
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(&nodes[0], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[2]));
	//... and we can even still claim the payment!
	claim_payment(&nodes[2], &[&nodes[0], &nodes[1]], our_payment_preimage);

Expand DownExpand Up@@ -666,10 +668,12 @@ fn test_forwardable_regen() {
	let chan_1_monitor_serialized = get_monitor!(nodes[1], chan_id_2).encode();
	reload_node!(nodes[1], nodes[1].node.encode(), &[&chan_0_monitor_serialized, &chan_1_monitor_serialized], persister, new_chain_monitor, nodes_1_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	// Note that nodes[1] and nodes[2] resend their channel_ready here since they haven't updated
	// the commitment state.
	reconnect_nodes(&nodes[1], &nodes[2], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

Expand DownExpand Up@@ -967,7 +971,7 @@ fn do_forwarded_payment_no_manager_persistence(use_cs_commitment: bool, claim_ht
	check_added_monitors!(nodes[1], 1);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	if use_cs_commitment {
 // If we confirm a commitment transaction that has the HTLC on-chain, nodes[1] should wait
Expand DownExpand Up@@ -1085,7 +1089,7 @@ fn removed_payment_no_manager_persistence() {
	// now forgotten everywhere. The ChannelManager should have, as a side-effect of reload,
	// learned that the HTLC is gone from the ChannelMonitor and added it to the to-fail-back set.
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], [HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
	check_added_monitors!(nodes[1], 1);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Struct-ify `reconnect_nodes` test util args by valentinewallace · Pull Request #2459 · lightningdevkit/rust-lightning · GitHub
Skip to content
Struct-ify reconnect_nodes test util args#2459

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

tnull
merged 1 commit into

from

Jul 31, 2023
 Merged


Struct-ify reconnect_nodes test util args
#2459
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


18 changes: 13 additions & 5 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,7 +178,9 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.send_channel_ready = (true, true);
 reconnect_nodes(reconnect_args);
	}

	chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
Expand DownExpand Up@@ -233,7 +235,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	// ...and make sure we can force-close a frozen channel
Expand DownExpand Up@@ -1925,7 +1927,9 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:
	// Make sure nodes[1] isn't stupid enough to re-send the ChannelReady on reconnect
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, confirm_a_first), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready.1 = confirm_a_first;
	reconnect_nodes(reconnect_args);

	// But we want to re-emit ChannelPending
	expect_channel_pending_event(&nodes[1], &nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -2575,10 +2579,14 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
	nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	if second_fails {
 reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (1, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
 reconnect_args.pending_htlc_fails.0 = 1;
 reconnect_nodes(reconnect_args);
 expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
	} else {
 reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
 reconnect_args.pending_htlc_claims.0 = 1;
 reconnect_nodes(reconnect_args);
	}

	if htlc_status == HTLCStatusAtDupClaim::HoldingCell {
Expand Down

34 changes: 33 additions & 1 deletion
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2945,9 +2945,41 @@ macro_rules! handle_chan_reestablish_msgs {
	}
}

pub struct ReconnectArgs<'a, 'b, 'c, 'd> {
	pub node_a: &'a Node<'b, 'c, 'd>,
	pub node_b: &'a Node<'b, 'c, 'd>,
	pub send_channel_ready: (bool, bool),
	pub pending_htlc_adds: (i64, i64),
	pub pending_htlc_claims: (usize, usize),
	pub pending_htlc_fails: (usize, usize),
	pub pending_cell_htlc_claims: (usize, usize),
	pub pending_cell_htlc_fails: (usize, usize),
	pub pending_raa: (bool, bool),
}

impl<'a, 'b, 'c, 'd> ReconnectArgs<'a, 'b, 'c, 'd> {
	pub fn new(node_a: &'a Node<'b, 'c, 'd>, node_b: &'a Node<'b, 'c, 'd>) -> Self {
 Self {
 node_a,
 node_b,
 send_channel_ready: (false, false),
 pending_htlc_adds: (0, 0),
 pending_htlc_claims: (0, 0),
 pending_htlc_fails: (0, 0),
 pending_cell_htlc_claims: (0, 0),
 pending_cell_htlc_fails: (0, 0),
 pending_raa: (false, false),
 }
	}
}

/// pending_htlc_adds includes both the holding cell and in-flight update_add_htlcs, whereas
/// for claims/fails they are separated out.
pub fn reconnect_nodes<'a, 'b, 'c>(node_a: &Node<'a, 'b, 'c>, node_b: &Node<'a, 'b, 'c>, send_channel_ready: (bool, bool), pending_htlc_adds: (i64, i64), pending_htlc_claims: (usize, usize), pending_htlc_fails: (usize, usize), pending_cell_htlc_claims: (usize, usize), pending_cell_htlc_fails: (usize, usize), pending_raa: (bool, bool)) {
pub fn reconnect_nodes<'a, 'b, 'c, 'd>(args: ReconnectArgs<'a, 'b, 'c, 'd>) {
	let ReconnectArgs {
 node_a, node_b, send_channel_ready, pending_htlc_adds, pending_htlc_claims, pending_htlc_fails,
 pending_cell_htlc_claims, pending_cell_htlc_fails, pending_raa
	} = args;
	node_a.node.peer_connected(&node_b.node.get_our_node_id(), &msgs::Init {
 features: node_b.node.init_features(), networks: None, remote_network_address: None
	}, true).unwrap();
Expand Down

58 changes: 42 additions & 16 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3585,7 +3585,9 @@ fn test_dup_events_on_peer_disconnect() {
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.pending_htlc_claims.0 = 1;
	reconnect_nodes(reconnect_args);
	expect_payment_path_successful!(nodes[0]);
}

Expand DownExpand Up@@ -3642,7 +3644,9 @@ fn test_simple_peer_disconnect() {

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	let payment_preimage_1 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
	let payment_hash_2 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).1;
Expand All@@ -3651,7 +3655,7 @@ fn test_simple_peer_disconnect() {

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	let (payment_preimage_3, payment_hash_3, _) = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000);
	let payment_preimage_4 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
Expand All@@ -3664,7 +3668,10 @@ fn test_simple_peer_disconnect() {
	claim_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], true, payment_preimage_3);
	fail_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], true, payment_hash_5);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (1, 0), (1, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.pending_cell_htlc_fails.0 = 1;
	reconnect_args.pending_cell_htlc_claims.0 = 1;
	reconnect_nodes(reconnect_args);
	{
 let events = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events.len(), 4);
Expand DownExpand Up@@ -3776,19 +3783,29 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
 }
 // Even if the channel_ready messages get exchanged, as long as nothing further was
 // received on either side, both sides will need to resend them.
 reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 1), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.send_channel_ready = (true, true);
 reconnect_args.pending_htlc_adds.1 = 1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 3 {
 // nodes[0] still wants its RAA + commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (-1, 0), (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.0 = -1;
 reconnect_args.pending_raa.0 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 4 {
 // nodes[0] still wants its commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (-1, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.0 = -1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 5 {
 // nodes[1] still wants its final RAA
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_raa.1 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 6 {
 // Everything was delivered...
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	let events_1 = nodes[1].node.get_and_clear_pending_events();
Expand All@@ -3812,7 +3829,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	nodes[1].node.process_pending_htlc_forwards();

Expand DownExpand Up@@ -3896,24 +3913,33 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	if messages_delivered < 2 {
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_claims.0 = 1;
 reconnect_nodes(reconnect_args);
 if messages_delivered < 1 {
 expect_payment_sent!(nodes[0], payment_preimage_1);
 } else {
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 }
	} else if messages_delivered == 2 {
 // nodes[0] still wants its RAA + commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, -1), (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.1 = -1;
 reconnect_args.pending_raa.1 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 3 {
 // nodes[0] still wants its commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, -1), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.1 = -1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 4 {
 // nodes[1] still wants its final RAA
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_raa.0 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 5 {
 // Everything was delivered...
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	if messages_delivered == 1 || messages_delivered == 2 {
Expand All@@ -3923,7 +3949,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	}
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	if messages_delivered > 2 {
 expect_payment_path_successful!(nodes[0]);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -597,7 +597,7 @@ fn test_onion_failure() {
 nodes[1].node.get_and_clear_pending_msg_events();
 nodes[2].node.get_and_clear_pending_msg_events();
	}, true, Some(UPDATE|20), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[2]));

	run_onion_failure_test("expiry_too_far", 0, &nodes, &route, &payment_hash, &payment_secret, |msg| {
 let session_priv = SecretKey::from_slice(&[3; 32]).unwrap();
Expand Down

16 changes: 10 additions & 6 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -490,7 +490,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
	// nodes[1] now immediately fails the HTLC as the next-hop channel is disconnected
	let _ = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[2]));

	let as_commitment_tx = get_local_commitment_txn!(nodes[0], chan_id)[0].clone();
	if confirm_before_reload {
Expand DownExpand Up@@ -789,7 +789,9 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
	nodes[0].node.test_process_background_events();
	check_added_monitors(&nodes[0], 1);

	reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	// Now resend the payment, delivering the HTLC and actually claiming it this time. This ensures
	// the payment is not (spuriously) listed as still pending.
Expand DownExpand Up@@ -817,7 +819,7 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
	nodes[0].node.test_process_background_events();
	check_added_monitors(&nodes[0], 1);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	match nodes[0].node.send_payment_with_route(&new_route, payment_hash, RecipientOnionFields::secret_only(payment_secret), payment_id) {
 Err(PaymentSendFailure::DuplicatePayment) => {},
Expand DownExpand Up@@ -1011,7 +1013,7 @@ fn test_fulfill_restart_failure() {
	reload_node!(nodes[1], &chan_manager_serialized, &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_1_deserialized);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	nodes[1].node.fail_htlc_backwards(&payment_hash);
	expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::FailedPayment { payment_hash }]);
Expand DownExpand Up@@ -3422,9 +3424,11 @@ fn do_test_payment_metadata_consistency(do_reload: bool, do_modify: bool) {
 reload_node!(nodes[3], config, &nodes[3].node.encode(), &[&mon_bd, &mon_cd],
 persister, new_chain_monitor, nodes_0_deserialized);
 nodes[1].node.peer_disconnected(&nodes[3].node.get_our_node_id());
 reconnect_nodes(&nodes[1], &nodes[3], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[3]));
	}
	reconnect_nodes(&nodes[2], &nodes[3], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[2], &nodes[3]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	// Create a new channel between C and D as A will refuse to retry on the existing one because
	// it just failed.
Expand Down

22 changes: 13 additions & 9 deletions
lightning/src/ln/reload_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,9 @@ fn test_funding_peer_disconnect() {
	let events_1 = nodes[0].node.get_and_clear_pending_msg_events();
	assert!(events_1.is_empty());

	reconnect_nodes(&nodes[0], &nodes[1], (false, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready.1 = true;
	reconnect_nodes(reconnect_args);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -180,7 +182,7 @@ fn test_funding_peer_disconnect() {

	reload_node!(nodes[0], &nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
}

#[test]
Expand DownExpand Up@@ -334,7 +336,7 @@ fn test_simple_manager_serialize_deserialize() {
	let chan_0_monitor_serialized = get_monitor!(nodes[0], chan_id).encode();
	reload_node!(nodes[0], nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	fail_payment(&nodes[0], &[&nodes[1]], our_payment_hash);
	claim_payment(&nodes[0], &[&nodes[1]], our_payment_preimage);
Expand DownExpand Up@@ -456,8 +458,8 @@ fn test_manager_serialize_deserialize_inconsistent_monitor() {
	check_added_monitors!(nodes[0], 1);

	// nodes[1] and nodes[2] have no lost state with nodes[0]...
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(&nodes[0], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[2]));
	//... and we can even still claim the payment!
	claim_payment(&nodes[2], &[&nodes[0], &nodes[1]], our_payment_preimage);

Expand DownExpand Up@@ -666,10 +668,12 @@ fn test_forwardable_regen() {
	let chan_1_monitor_serialized = get_monitor!(nodes[1], chan_id_2).encode();
	reload_node!(nodes[1], nodes[1].node.encode(), &[&chan_0_monitor_serialized, &chan_1_monitor_serialized], persister, new_chain_monitor, nodes_1_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	// Note that nodes[1] and nodes[2] resend their channel_ready here since they haven't updated
	// the commitment state.
	reconnect_nodes(&nodes[1], &nodes[2], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

Expand DownExpand Up@@ -967,7 +971,7 @@ fn do_forwarded_payment_no_manager_persistence(use_cs_commitment: bool, claim_ht
	check_added_monitors!(nodes[1], 1);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	if use_cs_commitment {
 // If we confirm a commitment transaction that has the HTLC on-chain, nodes[1] should wait
Expand DownExpand Up@@ -1085,7 +1089,7 @@ fn removed_payment_no_manager_persistence() {
	// now forgotten everywhere. The ChannelManager should have, as a side-effect of reload,
	// learned that the HTLC is gone from the ChannelMonitor and added it to the to-fail-back set.
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], [HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
	check_added_monitors!(nodes[1], 1);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Struct-ify `reconnect_nodes` test util args by valentinewallace · Pull Request #2459 · lightningdevkit/rust-lightning · GitHub
Skip to content
Struct-ify reconnect_nodes test util args#2459

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

tnull
merged 1 commit into

from

Jul 31, 2023
 Merged


Struct-ify reconnect_nodes test util args
#2459
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


18 changes: 13 additions & 5 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,7 +178,9 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.send_channel_ready = (true, true);
 reconnect_nodes(reconnect_args);
	}

	chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
Expand DownExpand Up@@ -233,7 +235,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	// ...and make sure we can force-close a frozen channel
Expand DownExpand Up@@ -1925,7 +1927,9 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:
	// Make sure nodes[1] isn't stupid enough to re-send the ChannelReady on reconnect
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, confirm_a_first), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready.1 = confirm_a_first;
	reconnect_nodes(reconnect_args);

	// But we want to re-emit ChannelPending
	expect_channel_pending_event(&nodes[1], &nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -2575,10 +2579,14 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
	nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	if second_fails {
 reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (1, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
 reconnect_args.pending_htlc_fails.0 = 1;
 reconnect_nodes(reconnect_args);
 expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
	} else {
 reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
 reconnect_args.pending_htlc_claims.0 = 1;
 reconnect_nodes(reconnect_args);
	}

	if htlc_status == HTLCStatusAtDupClaim::HoldingCell {
Expand Down

34 changes: 33 additions & 1 deletion
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2945,9 +2945,41 @@ macro_rules! handle_chan_reestablish_msgs {
	}
}

pub struct ReconnectArgs<'a, 'b, 'c, 'd> {
	pub node_a: &'a Node<'b, 'c, 'd>,
	pub node_b: &'a Node<'b, 'c, 'd>,
	pub send_channel_ready: (bool, bool),
	pub pending_htlc_adds: (i64, i64),
	pub pending_htlc_claims: (usize, usize),
	pub pending_htlc_fails: (usize, usize),
	pub pending_cell_htlc_claims: (usize, usize),
	pub pending_cell_htlc_fails: (usize, usize),
	pub pending_raa: (bool, bool),
}

impl<'a, 'b, 'c, 'd> ReconnectArgs<'a, 'b, 'c, 'd> {
	pub fn new(node_a: &'a Node<'b, 'c, 'd>, node_b: &'a Node<'b, 'c, 'd>) -> Self {
 Self {
 node_a,
 node_b,
 send_channel_ready: (false, false),
 pending_htlc_adds: (0, 0),
 pending_htlc_claims: (0, 0),
 pending_htlc_fails: (0, 0),
 pending_cell_htlc_claims: (0, 0),
 pending_cell_htlc_fails: (0, 0),
 pending_raa: (false, false),
 }
	}
}

/// pending_htlc_adds includes both the holding cell and in-flight update_add_htlcs, whereas
/// for claims/fails they are separated out.
pub fn reconnect_nodes<'a, 'b, 'c>(node_a: &Node<'a, 'b, 'c>, node_b: &Node<'a, 'b, 'c>, send_channel_ready: (bool, bool), pending_htlc_adds: (i64, i64), pending_htlc_claims: (usize, usize), pending_htlc_fails: (usize, usize), pending_cell_htlc_claims: (usize, usize), pending_cell_htlc_fails: (usize, usize), pending_raa: (bool, bool)) {
pub fn reconnect_nodes<'a, 'b, 'c, 'd>(args: ReconnectArgs<'a, 'b, 'c, 'd>) {
	let ReconnectArgs {
 node_a, node_b, send_channel_ready, pending_htlc_adds, pending_htlc_claims, pending_htlc_fails,
 pending_cell_htlc_claims, pending_cell_htlc_fails, pending_raa
	} = args;
	node_a.node.peer_connected(&node_b.node.get_our_node_id(), &msgs::Init {
 features: node_b.node.init_features(), networks: None, remote_network_address: None
	}, true).unwrap();
Expand Down

58 changes: 42 additions & 16 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3585,7 +3585,9 @@ fn test_dup_events_on_peer_disconnect() {
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.pending_htlc_claims.0 = 1;
	reconnect_nodes(reconnect_args);
	expect_payment_path_successful!(nodes[0]);
}

Expand DownExpand Up@@ -3642,7 +3644,9 @@ fn test_simple_peer_disconnect() {

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	let payment_preimage_1 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
	let payment_hash_2 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).1;
Expand All@@ -3651,7 +3655,7 @@ fn test_simple_peer_disconnect() {

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	let (payment_preimage_3, payment_hash_3, _) = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000);
	let payment_preimage_4 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
Expand All@@ -3664,7 +3668,10 @@ fn test_simple_peer_disconnect() {
	claim_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], true, payment_preimage_3);
	fail_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], true, payment_hash_5);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (1, 0), (1, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.pending_cell_htlc_fails.0 = 1;
	reconnect_args.pending_cell_htlc_claims.0 = 1;
	reconnect_nodes(reconnect_args);
	{
 let events = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events.len(), 4);
Expand DownExpand Up@@ -3776,19 +3783,29 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
 }
 // Even if the channel_ready messages get exchanged, as long as nothing further was
 // received on either side, both sides will need to resend them.
 reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 1), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.send_channel_ready = (true, true);
 reconnect_args.pending_htlc_adds.1 = 1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 3 {
 // nodes[0] still wants its RAA + commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (-1, 0), (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.0 = -1;
 reconnect_args.pending_raa.0 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 4 {
 // nodes[0] still wants its commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (-1, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.0 = -1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 5 {
 // nodes[1] still wants its final RAA
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_raa.1 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 6 {
 // Everything was delivered...
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	let events_1 = nodes[1].node.get_and_clear_pending_events();
Expand All@@ -3812,7 +3829,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	nodes[1].node.process_pending_htlc_forwards();

Expand DownExpand Up@@ -3896,24 +3913,33 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	if messages_delivered < 2 {
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_claims.0 = 1;
 reconnect_nodes(reconnect_args);
 if messages_delivered < 1 {
 expect_payment_sent!(nodes[0], payment_preimage_1);
 } else {
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 }
	} else if messages_delivered == 2 {
 // nodes[0] still wants its RAA + commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, -1), (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.1 = -1;
 reconnect_args.pending_raa.1 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 3 {
 // nodes[0] still wants its commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, -1), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.1 = -1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 4 {
 // nodes[1] still wants its final RAA
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_raa.0 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 5 {
 // Everything was delivered...
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	if messages_delivered == 1 || messages_delivered == 2 {
Expand All@@ -3923,7 +3949,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	}
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	if messages_delivered > 2 {
 expect_payment_path_successful!(nodes[0]);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -597,7 +597,7 @@ fn test_onion_failure() {
 nodes[1].node.get_and_clear_pending_msg_events();
 nodes[2].node.get_and_clear_pending_msg_events();
	}, true, Some(UPDATE|20), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[2]));

	run_onion_failure_test("expiry_too_far", 0, &nodes, &route, &payment_hash, &payment_secret, |msg| {
 let session_priv = SecretKey::from_slice(&[3; 32]).unwrap();
Expand Down

16 changes: 10 additions & 6 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -490,7 +490,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
	// nodes[1] now immediately fails the HTLC as the next-hop channel is disconnected
	let _ = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[2]));

	let as_commitment_tx = get_local_commitment_txn!(nodes[0], chan_id)[0].clone();
	if confirm_before_reload {
Expand DownExpand Up@@ -789,7 +789,9 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
	nodes[0].node.test_process_background_events();
	check_added_monitors(&nodes[0], 1);

	reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	// Now resend the payment, delivering the HTLC and actually claiming it this time. This ensures
	// the payment is not (spuriously) listed as still pending.
Expand DownExpand Up@@ -817,7 +819,7 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
	nodes[0].node.test_process_background_events();
	check_added_monitors(&nodes[0], 1);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	match nodes[0].node.send_payment_with_route(&new_route, payment_hash, RecipientOnionFields::secret_only(payment_secret), payment_id) {
 Err(PaymentSendFailure::DuplicatePayment) => {},
Expand DownExpand Up@@ -1011,7 +1013,7 @@ fn test_fulfill_restart_failure() {
	reload_node!(nodes[1], &chan_manager_serialized, &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_1_deserialized);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	nodes[1].node.fail_htlc_backwards(&payment_hash);
	expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::FailedPayment { payment_hash }]);
Expand DownExpand Up@@ -3422,9 +3424,11 @@ fn do_test_payment_metadata_consistency(do_reload: bool, do_modify: bool) {
 reload_node!(nodes[3], config, &nodes[3].node.encode(), &[&mon_bd, &mon_cd],
 persister, new_chain_monitor, nodes_0_deserialized);
 nodes[1].node.peer_disconnected(&nodes[3].node.get_our_node_id());
 reconnect_nodes(&nodes[1], &nodes[3], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[3]));
	}
	reconnect_nodes(&nodes[2], &nodes[3], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[2], &nodes[3]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	// Create a new channel between C and D as A will refuse to retry on the existing one because
	// it just failed.
Expand Down

22 changes: 13 additions & 9 deletions
lightning/src/ln/reload_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,9 @@ fn test_funding_peer_disconnect() {
	let events_1 = nodes[0].node.get_and_clear_pending_msg_events();
	assert!(events_1.is_empty());

	reconnect_nodes(&nodes[0], &nodes[1], (false, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready.1 = true;
	reconnect_nodes(reconnect_args);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -180,7 +182,7 @@ fn test_funding_peer_disconnect() {

	reload_node!(nodes[0], &nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
}

#[test]
Expand DownExpand Up@@ -334,7 +336,7 @@ fn test_simple_manager_serialize_deserialize() {
	let chan_0_monitor_serialized = get_monitor!(nodes[0], chan_id).encode();
	reload_node!(nodes[0], nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	fail_payment(&nodes[0], &[&nodes[1]], our_payment_hash);
	claim_payment(&nodes[0], &[&nodes[1]], our_payment_preimage);
Expand DownExpand Up@@ -456,8 +458,8 @@ fn test_manager_serialize_deserialize_inconsistent_monitor() {
	check_added_monitors!(nodes[0], 1);

	// nodes[1] and nodes[2] have no lost state with nodes[0]...
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(&nodes[0], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[2]));
	//... and we can even still claim the payment!
	claim_payment(&nodes[2], &[&nodes[0], &nodes[1]], our_payment_preimage);

Expand DownExpand Up@@ -666,10 +668,12 @@ fn test_forwardable_regen() {
	let chan_1_monitor_serialized = get_monitor!(nodes[1], chan_id_2).encode();
	reload_node!(nodes[1], nodes[1].node.encode(), &[&chan_0_monitor_serialized, &chan_1_monitor_serialized], persister, new_chain_monitor, nodes_1_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	// Note that nodes[1] and nodes[2] resend their channel_ready here since they haven't updated
	// the commitment state.
	reconnect_nodes(&nodes[1], &nodes[2], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

Expand DownExpand Up@@ -967,7 +971,7 @@ fn do_forwarded_payment_no_manager_persistence(use_cs_commitment: bool, claim_ht
	check_added_monitors!(nodes[1], 1);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	if use_cs_commitment {
 // If we confirm a commitment transaction that has the HTLC on-chain, nodes[1] should wait
Expand DownExpand Up@@ -1085,7 +1089,7 @@ fn removed_payment_no_manager_persistence() {
	// now forgotten everywhere. The ChannelManager should have, as a side-effect of reload,
	// learned that the HTLC is gone from the ChannelMonitor and added it to the to-fail-back set.
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], [HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
	check_added_monitors!(nodes[1], 1);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Struct-ify `reconnect_nodes` test util args by valentinewallace · Pull Request #2459 · lightningdevkit/rust-lightning · GitHub
Skip to content
Struct-ify reconnect_nodes test util args#2459

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

tnull
merged 1 commit into

from

Jul 31, 2023
 Merged


Struct-ify reconnect_nodes test util args
#2459
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


18 changes: 13 additions & 5 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,7 +178,9 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.send_channel_ready = (true, true);
 reconnect_nodes(reconnect_args);
	}

	chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
Expand DownExpand Up@@ -233,7 +235,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	// ...and make sure we can force-close a frozen channel
Expand DownExpand Up@@ -1925,7 +1927,9 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:
	// Make sure nodes[1] isn't stupid enough to re-send the ChannelReady on reconnect
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, confirm_a_first), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready.1 = confirm_a_first;
	reconnect_nodes(reconnect_args);

	// But we want to re-emit ChannelPending
	expect_channel_pending_event(&nodes[1], &nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -2575,10 +2579,14 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
	nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	if second_fails {
 reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (1, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
 reconnect_args.pending_htlc_fails.0 = 1;
 reconnect_nodes(reconnect_args);
 expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
	} else {
 reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
 reconnect_args.pending_htlc_claims.0 = 1;
 reconnect_nodes(reconnect_args);
	}

	if htlc_status == HTLCStatusAtDupClaim::HoldingCell {
Expand Down

34 changes: 33 additions & 1 deletion
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2945,9 +2945,41 @@ macro_rules! handle_chan_reestablish_msgs {
	}
}

pub struct ReconnectArgs<'a, 'b, 'c, 'd> {
	pub node_a: &'a Node<'b, 'c, 'd>,
	pub node_b: &'a Node<'b, 'c, 'd>,
	pub send_channel_ready: (bool, bool),
	pub pending_htlc_adds: (i64, i64),
	pub pending_htlc_claims: (usize, usize),
	pub pending_htlc_fails: (usize, usize),
	pub pending_cell_htlc_claims: (usize, usize),
	pub pending_cell_htlc_fails: (usize, usize),
	pub pending_raa: (bool, bool),
}

impl<'a, 'b, 'c, 'd> ReconnectArgs<'a, 'b, 'c, 'd> {
	pub fn new(node_a: &'a Node<'b, 'c, 'd>, node_b: &'a Node<'b, 'c, 'd>) -> Self {
 Self {
 node_a,
 node_b,
 send_channel_ready: (false, false),
 pending_htlc_adds: (0, 0),
 pending_htlc_claims: (0, 0),
 pending_htlc_fails: (0, 0),
 pending_cell_htlc_claims: (0, 0),
 pending_cell_htlc_fails: (0, 0),
 pending_raa: (false, false),
 }
	}
}

/// pending_htlc_adds includes both the holding cell and in-flight update_add_htlcs, whereas
/// for claims/fails they are separated out.
pub fn reconnect_nodes<'a, 'b, 'c>(node_a: &Node<'a, 'b, 'c>, node_b: &Node<'a, 'b, 'c>, send_channel_ready: (bool, bool), pending_htlc_adds: (i64, i64), pending_htlc_claims: (usize, usize), pending_htlc_fails: (usize, usize), pending_cell_htlc_claims: (usize, usize), pending_cell_htlc_fails: (usize, usize), pending_raa: (bool, bool)) {
pub fn reconnect_nodes<'a, 'b, 'c, 'd>(args: ReconnectArgs<'a, 'b, 'c, 'd>) {
	let ReconnectArgs {
 node_a, node_b, send_channel_ready, pending_htlc_adds, pending_htlc_claims, pending_htlc_fails,
 pending_cell_htlc_claims, pending_cell_htlc_fails, pending_raa
	} = args;
	node_a.node.peer_connected(&node_b.node.get_our_node_id(), &msgs::Init {
 features: node_b.node.init_features(), networks: None, remote_network_address: None
	}, true).unwrap();
Expand Down

58 changes: 42 additions & 16 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3585,7 +3585,9 @@ fn test_dup_events_on_peer_disconnect() {
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.pending_htlc_claims.0 = 1;
	reconnect_nodes(reconnect_args);
	expect_payment_path_successful!(nodes[0]);
}

Expand DownExpand Up@@ -3642,7 +3644,9 @@ fn test_simple_peer_disconnect() {

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	let payment_preimage_1 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
	let payment_hash_2 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).1;
Expand All@@ -3651,7 +3655,7 @@ fn test_simple_peer_disconnect() {

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	let (payment_preimage_3, payment_hash_3, _) = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000);
	let payment_preimage_4 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
Expand All@@ -3664,7 +3668,10 @@ fn test_simple_peer_disconnect() {
	claim_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], true, payment_preimage_3);
	fail_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], true, payment_hash_5);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (1, 0), (1, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.pending_cell_htlc_fails.0 = 1;
	reconnect_args.pending_cell_htlc_claims.0 = 1;
	reconnect_nodes(reconnect_args);
	{
 let events = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events.len(), 4);
Expand DownExpand Up@@ -3776,19 +3783,29 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
 }
 // Even if the channel_ready messages get exchanged, as long as nothing further was
 // received on either side, both sides will need to resend them.
 reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 1), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.send_channel_ready = (true, true);
 reconnect_args.pending_htlc_adds.1 = 1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 3 {
 // nodes[0] still wants its RAA + commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (-1, 0), (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.0 = -1;
 reconnect_args.pending_raa.0 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 4 {
 // nodes[0] still wants its commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (-1, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.0 = -1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 5 {
 // nodes[1] still wants its final RAA
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_raa.1 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 6 {
 // Everything was delivered...
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	let events_1 = nodes[1].node.get_and_clear_pending_events();
Expand All@@ -3812,7 +3829,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	nodes[1].node.process_pending_htlc_forwards();

Expand DownExpand Up@@ -3896,24 +3913,33 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	if messages_delivered < 2 {
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_claims.0 = 1;
 reconnect_nodes(reconnect_args);
 if messages_delivered < 1 {
 expect_payment_sent!(nodes[0], payment_preimage_1);
 } else {
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 }
	} else if messages_delivered == 2 {
 // nodes[0] still wants its RAA + commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, -1), (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.1 = -1;
 reconnect_args.pending_raa.1 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 3 {
 // nodes[0] still wants its commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, -1), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.1 = -1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 4 {
 // nodes[1] still wants its final RAA
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_raa.0 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 5 {
 // Everything was delivered...
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	if messages_delivered == 1 || messages_delivered == 2 {
Expand All@@ -3923,7 +3949,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	}
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	if messages_delivered > 2 {
 expect_payment_path_successful!(nodes[0]);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -597,7 +597,7 @@ fn test_onion_failure() {
 nodes[1].node.get_and_clear_pending_msg_events();
 nodes[2].node.get_and_clear_pending_msg_events();
	}, true, Some(UPDATE|20), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[2]));

	run_onion_failure_test("expiry_too_far", 0, &nodes, &route, &payment_hash, &payment_secret, |msg| {
 let session_priv = SecretKey::from_slice(&[3; 32]).unwrap();
Expand Down

16 changes: 10 additions & 6 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -490,7 +490,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
	// nodes[1] now immediately fails the HTLC as the next-hop channel is disconnected
	let _ = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[2]));

	let as_commitment_tx = get_local_commitment_txn!(nodes[0], chan_id)[0].clone();
	if confirm_before_reload {
Expand DownExpand Up@@ -789,7 +789,9 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
	nodes[0].node.test_process_background_events();
	check_added_monitors(&nodes[0], 1);

	reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	// Now resend the payment, delivering the HTLC and actually claiming it this time. This ensures
	// the payment is not (spuriously) listed as still pending.
Expand DownExpand Up@@ -817,7 +819,7 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
	nodes[0].node.test_process_background_events();
	check_added_monitors(&nodes[0], 1);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	match nodes[0].node.send_payment_with_route(&new_route, payment_hash, RecipientOnionFields::secret_only(payment_secret), payment_id) {
 Err(PaymentSendFailure::DuplicatePayment) => {},
Expand DownExpand Up@@ -1011,7 +1013,7 @@ fn test_fulfill_restart_failure() {
	reload_node!(nodes[1], &chan_manager_serialized, &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_1_deserialized);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	nodes[1].node.fail_htlc_backwards(&payment_hash);
	expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::FailedPayment { payment_hash }]);
Expand DownExpand Up@@ -3422,9 +3424,11 @@ fn do_test_payment_metadata_consistency(do_reload: bool, do_modify: bool) {
 reload_node!(nodes[3], config, &nodes[3].node.encode(), &[&mon_bd, &mon_cd],
 persister, new_chain_monitor, nodes_0_deserialized);
 nodes[1].node.peer_disconnected(&nodes[3].node.get_our_node_id());
 reconnect_nodes(&nodes[1], &nodes[3], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[3]));
	}
	reconnect_nodes(&nodes[2], &nodes[3], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[2], &nodes[3]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	// Create a new channel between C and D as A will refuse to retry on the existing one because
	// it just failed.
Expand Down

22 changes: 13 additions & 9 deletions
lightning/src/ln/reload_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,9 @@ fn test_funding_peer_disconnect() {
	let events_1 = nodes[0].node.get_and_clear_pending_msg_events();
	assert!(events_1.is_empty());

	reconnect_nodes(&nodes[0], &nodes[1], (false, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready.1 = true;
	reconnect_nodes(reconnect_args);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -180,7 +182,7 @@ fn test_funding_peer_disconnect() {

	reload_node!(nodes[0], &nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
}

#[test]
Expand DownExpand Up@@ -334,7 +336,7 @@ fn test_simple_manager_serialize_deserialize() {
	let chan_0_monitor_serialized = get_monitor!(nodes[0], chan_id).encode();
	reload_node!(nodes[0], nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	fail_payment(&nodes[0], &[&nodes[1]], our_payment_hash);
	claim_payment(&nodes[0], &[&nodes[1]], our_payment_preimage);
Expand DownExpand Up@@ -456,8 +458,8 @@ fn test_manager_serialize_deserialize_inconsistent_monitor() {
	check_added_monitors!(nodes[0], 1);

	// nodes[1] and nodes[2] have no lost state with nodes[0]...
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(&nodes[0], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[2]));
	//... and we can even still claim the payment!
	claim_payment(&nodes[2], &[&nodes[0], &nodes[1]], our_payment_preimage);

Expand DownExpand Up@@ -666,10 +668,12 @@ fn test_forwardable_regen() {
	let chan_1_monitor_serialized = get_monitor!(nodes[1], chan_id_2).encode();
	reload_node!(nodes[1], nodes[1].node.encode(), &[&chan_0_monitor_serialized, &chan_1_monitor_serialized], persister, new_chain_monitor, nodes_1_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	// Note that nodes[1] and nodes[2] resend their channel_ready here since they haven't updated
	// the commitment state.
	reconnect_nodes(&nodes[1], &nodes[2], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

Expand DownExpand Up@@ -967,7 +971,7 @@ fn do_forwarded_payment_no_manager_persistence(use_cs_commitment: bool, claim_ht
	check_added_monitors!(nodes[1], 1);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	if use_cs_commitment {
 // If we confirm a commitment transaction that has the HTLC on-chain, nodes[1] should wait
Expand DownExpand Up@@ -1085,7 +1089,7 @@ fn removed_payment_no_manager_persistence() {
	// now forgotten everywhere. The ChannelManager should have, as a side-effect of reload,
	// learned that the HTLC is gone from the ChannelMonitor and added it to the to-fail-back set.
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], [HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
	check_added_monitors!(nodes[1], 1);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Struct-ify `reconnect_nodes` test util args by valentinewallace · Pull Request #2459 · lightningdevkit/rust-lightning · GitHub
Skip to content
Struct-ify reconnect_nodes test util args#2459

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

tnull
merged 1 commit into

from

Jul 31, 2023
 Merged


Struct-ify reconnect_nodes test util args
#2459
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


18 changes: 13 additions & 5 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,7 +178,9 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.send_channel_ready = (true, true);
 reconnect_nodes(reconnect_args);
	}

	chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
Expand DownExpand Up@@ -233,7 +235,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	// ...and make sure we can force-close a frozen channel
Expand DownExpand Up@@ -1925,7 +1927,9 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:
	// Make sure nodes[1] isn't stupid enough to re-send the ChannelReady on reconnect
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, confirm_a_first), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready.1 = confirm_a_first;
	reconnect_nodes(reconnect_args);

	// But we want to re-emit ChannelPending
	expect_channel_pending_event(&nodes[1], &nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -2575,10 +2579,14 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
	nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	if second_fails {
 reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (1, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
 reconnect_args.pending_htlc_fails.0 = 1;
 reconnect_nodes(reconnect_args);
 expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
	} else {
 reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
 reconnect_args.pending_htlc_claims.0 = 1;
 reconnect_nodes(reconnect_args);
	}

	if htlc_status == HTLCStatusAtDupClaim::HoldingCell {
Expand Down

34 changes: 33 additions & 1 deletion
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2945,9 +2945,41 @@ macro_rules! handle_chan_reestablish_msgs {
	}
}

pub struct ReconnectArgs<'a, 'b, 'c, 'd> {
	pub node_a: &'a Node<'b, 'c, 'd>,
	pub node_b: &'a Node<'b, 'c, 'd>,
	pub send_channel_ready: (bool, bool),
	pub pending_htlc_adds: (i64, i64),
	pub pending_htlc_claims: (usize, usize),
	pub pending_htlc_fails: (usize, usize),
	pub pending_cell_htlc_claims: (usize, usize),
	pub pending_cell_htlc_fails: (usize, usize),
	pub pending_raa: (bool, bool),
}

impl<'a, 'b, 'c, 'd> ReconnectArgs<'a, 'b, 'c, 'd> {
	pub fn new(node_a: &'a Node<'b, 'c, 'd>, node_b: &'a Node<'b, 'c, 'd>) -> Self {
 Self {
 node_a,
 node_b,
 send_channel_ready: (false, false),
 pending_htlc_adds: (0, 0),
 pending_htlc_claims: (0, 0),
 pending_htlc_fails: (0, 0),
 pending_cell_htlc_claims: (0, 0),
 pending_cell_htlc_fails: (0, 0),
 pending_raa: (false, false),
 }
	}
}

/// pending_htlc_adds includes both the holding cell and in-flight update_add_htlcs, whereas
/// for claims/fails they are separated out.
pub fn reconnect_nodes<'a, 'b, 'c>(node_a: &Node<'a, 'b, 'c>, node_b: &Node<'a, 'b, 'c>, send_channel_ready: (bool, bool), pending_htlc_adds: (i64, i64), pending_htlc_claims: (usize, usize), pending_htlc_fails: (usize, usize), pending_cell_htlc_claims: (usize, usize), pending_cell_htlc_fails: (usize, usize), pending_raa: (bool, bool)) {
pub fn reconnect_nodes<'a, 'b, 'c, 'd>(args: ReconnectArgs<'a, 'b, 'c, 'd>) {
	let ReconnectArgs {
 node_a, node_b, send_channel_ready, pending_htlc_adds, pending_htlc_claims, pending_htlc_fails,
 pending_cell_htlc_claims, pending_cell_htlc_fails, pending_raa
	} = args;
	node_a.node.peer_connected(&node_b.node.get_our_node_id(), &msgs::Init {
 features: node_b.node.init_features(), networks: None, remote_network_address: None
	}, true).unwrap();
Expand Down

58 changes: 42 additions & 16 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3585,7 +3585,9 @@ fn test_dup_events_on_peer_disconnect() {
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.pending_htlc_claims.0 = 1;
	reconnect_nodes(reconnect_args);
	expect_payment_path_successful!(nodes[0]);
}

Expand DownExpand Up@@ -3642,7 +3644,9 @@ fn test_simple_peer_disconnect() {

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	let payment_preimage_1 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
	let payment_hash_2 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).1;
Expand All@@ -3651,7 +3655,7 @@ fn test_simple_peer_disconnect() {

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	let (payment_preimage_3, payment_hash_3, _) = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000);
	let payment_preimage_4 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
Expand All@@ -3664,7 +3668,10 @@ fn test_simple_peer_disconnect() {
	claim_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], true, payment_preimage_3);
	fail_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], true, payment_hash_5);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (1, 0), (1, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.pending_cell_htlc_fails.0 = 1;
	reconnect_args.pending_cell_htlc_claims.0 = 1;
	reconnect_nodes(reconnect_args);
	{
 let events = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events.len(), 4);
Expand DownExpand Up@@ -3776,19 +3783,29 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
 }
 // Even if the channel_ready messages get exchanged, as long as nothing further was
 // received on either side, both sides will need to resend them.
 reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 1), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.send_channel_ready = (true, true);
 reconnect_args.pending_htlc_adds.1 = 1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 3 {
 // nodes[0] still wants its RAA + commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (-1, 0), (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.0 = -1;
 reconnect_args.pending_raa.0 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 4 {
 // nodes[0] still wants its commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (-1, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.0 = -1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 5 {
 // nodes[1] still wants its final RAA
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_raa.1 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 6 {
 // Everything was delivered...
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	let events_1 = nodes[1].node.get_and_clear_pending_events();
Expand All@@ -3812,7 +3829,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	nodes[1].node.process_pending_htlc_forwards();

Expand DownExpand Up@@ -3896,24 +3913,33 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	if messages_delivered < 2 {
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_claims.0 = 1;
 reconnect_nodes(reconnect_args);
 if messages_delivered < 1 {
 expect_payment_sent!(nodes[0], payment_preimage_1);
 } else {
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 }
	} else if messages_delivered == 2 {
 // nodes[0] still wants its RAA + commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, -1), (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.1 = -1;
 reconnect_args.pending_raa.1 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 3 {
 // nodes[0] still wants its commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, -1), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.1 = -1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 4 {
 // nodes[1] still wants its final RAA
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_raa.0 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 5 {
 // Everything was delivered...
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	if messages_delivered == 1 || messages_delivered == 2 {
Expand All@@ -3923,7 +3949,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	}
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	if messages_delivered > 2 {
 expect_payment_path_successful!(nodes[0]);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -597,7 +597,7 @@ fn test_onion_failure() {
 nodes[1].node.get_and_clear_pending_msg_events();
 nodes[2].node.get_and_clear_pending_msg_events();
	}, true, Some(UPDATE|20), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[2]));

	run_onion_failure_test("expiry_too_far", 0, &nodes, &route, &payment_hash, &payment_secret, |msg| {
 let session_priv = SecretKey::from_slice(&[3; 32]).unwrap();
Expand Down

16 changes: 10 additions & 6 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -490,7 +490,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
	// nodes[1] now immediately fails the HTLC as the next-hop channel is disconnected
	let _ = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[2]));

	let as_commitment_tx = get_local_commitment_txn!(nodes[0], chan_id)[0].clone();
	if confirm_before_reload {
Expand DownExpand Up@@ -789,7 +789,9 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
	nodes[0].node.test_process_background_events();
	check_added_monitors(&nodes[0], 1);

	reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	// Now resend the payment, delivering the HTLC and actually claiming it this time. This ensures
	// the payment is not (spuriously) listed as still pending.
Expand DownExpand Up@@ -817,7 +819,7 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
	nodes[0].node.test_process_background_events();
	check_added_monitors(&nodes[0], 1);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	match nodes[0].node.send_payment_with_route(&new_route, payment_hash, RecipientOnionFields::secret_only(payment_secret), payment_id) {
 Err(PaymentSendFailure::DuplicatePayment) => {},
Expand DownExpand Up@@ -1011,7 +1013,7 @@ fn test_fulfill_restart_failure() {
	reload_node!(nodes[1], &chan_manager_serialized, &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_1_deserialized);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	nodes[1].node.fail_htlc_backwards(&payment_hash);
	expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::FailedPayment { payment_hash }]);
Expand DownExpand Up@@ -3422,9 +3424,11 @@ fn do_test_payment_metadata_consistency(do_reload: bool, do_modify: bool) {
 reload_node!(nodes[3], config, &nodes[3].node.encode(), &[&mon_bd, &mon_cd],
 persister, new_chain_monitor, nodes_0_deserialized);
 nodes[1].node.peer_disconnected(&nodes[3].node.get_our_node_id());
 reconnect_nodes(&nodes[1], &nodes[3], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[3]));
	}
	reconnect_nodes(&nodes[2], &nodes[3], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[2], &nodes[3]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	// Create a new channel between C and D as A will refuse to retry on the existing one because
	// it just failed.
Expand Down

22 changes: 13 additions & 9 deletions
lightning/src/ln/reload_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,9 @@ fn test_funding_peer_disconnect() {
	let events_1 = nodes[0].node.get_and_clear_pending_msg_events();
	assert!(events_1.is_empty());

	reconnect_nodes(&nodes[0], &nodes[1], (false, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready.1 = true;
	reconnect_nodes(reconnect_args);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -180,7 +182,7 @@ fn test_funding_peer_disconnect() {

	reload_node!(nodes[0], &nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
}

#[test]
Expand DownExpand Up@@ -334,7 +336,7 @@ fn test_simple_manager_serialize_deserialize() {
	let chan_0_monitor_serialized = get_monitor!(nodes[0], chan_id).encode();
	reload_node!(nodes[0], nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	fail_payment(&nodes[0], &[&nodes[1]], our_payment_hash);
	claim_payment(&nodes[0], &[&nodes[1]], our_payment_preimage);
Expand DownExpand Up@@ -456,8 +458,8 @@ fn test_manager_serialize_deserialize_inconsistent_monitor() {
	check_added_monitors!(nodes[0], 1);

	// nodes[1] and nodes[2] have no lost state with nodes[0]...
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(&nodes[0], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[2]));
	//... and we can even still claim the payment!
	claim_payment(&nodes[2], &[&nodes[0], &nodes[1]], our_payment_preimage);

Expand DownExpand Up@@ -666,10 +668,12 @@ fn test_forwardable_regen() {
	let chan_1_monitor_serialized = get_monitor!(nodes[1], chan_id_2).encode();
	reload_node!(nodes[1], nodes[1].node.encode(), &[&chan_0_monitor_serialized, &chan_1_monitor_serialized], persister, new_chain_monitor, nodes_1_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	// Note that nodes[1] and nodes[2] resend their channel_ready here since they haven't updated
	// the commitment state.
	reconnect_nodes(&nodes[1], &nodes[2], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

Expand DownExpand Up@@ -967,7 +971,7 @@ fn do_forwarded_payment_no_manager_persistence(use_cs_commitment: bool, claim_ht
	check_added_monitors!(nodes[1], 1);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	if use_cs_commitment {
 // If we confirm a commitment transaction that has the HTLC on-chain, nodes[1] should wait
Expand DownExpand Up@@ -1085,7 +1089,7 @@ fn removed_payment_no_manager_persistence() {
	// now forgotten everywhere. The ChannelManager should have, as a side-effect of reload,
	// learned that the HTLC is gone from the ChannelMonitor and added it to the to-fail-back set.
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], [HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
	check_added_monitors!(nodes[1], 1);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Struct-ify `reconnect_nodes` test util args by valentinewallace · Pull Request #2459 · lightningdevkit/rust-lightning · GitHub
Skip to content
Struct-ify reconnect_nodes test util args#2459

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

tnull
merged 1 commit into

from

Jul 31, 2023
 Merged


Struct-ify reconnect_nodes test util args
#2459
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


18 changes: 13 additions & 5 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,7 +178,9 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.send_channel_ready = (true, true);
 reconnect_nodes(reconnect_args);
	}

	chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
Expand DownExpand Up@@ -233,7 +235,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	// ...and make sure we can force-close a frozen channel
Expand DownExpand Up@@ -1925,7 +1927,9 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:
	// Make sure nodes[1] isn't stupid enough to re-send the ChannelReady on reconnect
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, confirm_a_first), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready.1 = confirm_a_first;
	reconnect_nodes(reconnect_args);

	// But we want to re-emit ChannelPending
	expect_channel_pending_event(&nodes[1], &nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -2575,10 +2579,14 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
	nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	if second_fails {
 reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (1, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
 reconnect_args.pending_htlc_fails.0 = 1;
 reconnect_nodes(reconnect_args);
 expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
	} else {
 reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
 reconnect_args.pending_htlc_claims.0 = 1;
 reconnect_nodes(reconnect_args);
	}

	if htlc_status == HTLCStatusAtDupClaim::HoldingCell {
Expand Down

34 changes: 33 additions & 1 deletion
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2945,9 +2945,41 @@ macro_rules! handle_chan_reestablish_msgs {
	}
}

pub struct ReconnectArgs<'a, 'b, 'c, 'd> {
	pub node_a: &'a Node<'b, 'c, 'd>,
	pub node_b: &'a Node<'b, 'c, 'd>,
	pub send_channel_ready: (bool, bool),
	pub pending_htlc_adds: (i64, i64),
	pub pending_htlc_claims: (usize, usize),
	pub pending_htlc_fails: (usize, usize),
	pub pending_cell_htlc_claims: (usize, usize),
	pub pending_cell_htlc_fails: (usize, usize),
	pub pending_raa: (bool, bool),
}

impl<'a, 'b, 'c, 'd> ReconnectArgs<'a, 'b, 'c, 'd> {
	pub fn new(node_a: &'a Node<'b, 'c, 'd>, node_b: &'a Node<'b, 'c, 'd>) -> Self {
 Self {
 node_a,
 node_b,
 send_channel_ready: (false, false),
 pending_htlc_adds: (0, 0),
 pending_htlc_claims: (0, 0),
 pending_htlc_fails: (0, 0),
 pending_cell_htlc_claims: (0, 0),
 pending_cell_htlc_fails: (0, 0),
 pending_raa: (false, false),
 }
	}
}

/// pending_htlc_adds includes both the holding cell and in-flight update_add_htlcs, whereas
/// for claims/fails they are separated out.
pub fn reconnect_nodes<'a, 'b, 'c>(node_a: &Node<'a, 'b, 'c>, node_b: &Node<'a, 'b, 'c>, send_channel_ready: (bool, bool), pending_htlc_adds: (i64, i64), pending_htlc_claims: (usize, usize), pending_htlc_fails: (usize, usize), pending_cell_htlc_claims: (usize, usize), pending_cell_htlc_fails: (usize, usize), pending_raa: (bool, bool)) {
pub fn reconnect_nodes<'a, 'b, 'c, 'd>(args: ReconnectArgs<'a, 'b, 'c, 'd>) {
	let ReconnectArgs {
 node_a, node_b, send_channel_ready, pending_htlc_adds, pending_htlc_claims, pending_htlc_fails,
 pending_cell_htlc_claims, pending_cell_htlc_fails, pending_raa
	} = args;
	node_a.node.peer_connected(&node_b.node.get_our_node_id(), &msgs::Init {
 features: node_b.node.init_features(), networks: None, remote_network_address: None
	}, true).unwrap();
Expand Down

58 changes: 42 additions & 16 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3585,7 +3585,9 @@ fn test_dup_events_on_peer_disconnect() {
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.pending_htlc_claims.0 = 1;
	reconnect_nodes(reconnect_args);
	expect_payment_path_successful!(nodes[0]);
}

Expand DownExpand Up@@ -3642,7 +3644,9 @@ fn test_simple_peer_disconnect() {

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	let payment_preimage_1 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
	let payment_hash_2 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).1;
Expand All@@ -3651,7 +3655,7 @@ fn test_simple_peer_disconnect() {

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	let (payment_preimage_3, payment_hash_3, _) = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000);
	let payment_preimage_4 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
Expand All@@ -3664,7 +3668,10 @@ fn test_simple_peer_disconnect() {
	claim_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], true, payment_preimage_3);
	fail_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], true, payment_hash_5);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (1, 0), (1, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.pending_cell_htlc_fails.0 = 1;
	reconnect_args.pending_cell_htlc_claims.0 = 1;
	reconnect_nodes(reconnect_args);
	{
 let events = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events.len(), 4);
Expand DownExpand Up@@ -3776,19 +3783,29 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
 }
 // Even if the channel_ready messages get exchanged, as long as nothing further was
 // received on either side, both sides will need to resend them.
 reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 1), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.send_channel_ready = (true, true);
 reconnect_args.pending_htlc_adds.1 = 1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 3 {
 // nodes[0] still wants its RAA + commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (-1, 0), (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.0 = -1;
 reconnect_args.pending_raa.0 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 4 {
 // nodes[0] still wants its commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (-1, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.0 = -1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 5 {
 // nodes[1] still wants its final RAA
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_raa.1 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 6 {
 // Everything was delivered...
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	let events_1 = nodes[1].node.get_and_clear_pending_events();
Expand All@@ -3812,7 +3829,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	nodes[1].node.process_pending_htlc_forwards();

Expand DownExpand Up@@ -3896,24 +3913,33 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	if messages_delivered < 2 {
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_claims.0 = 1;
 reconnect_nodes(reconnect_args);
 if messages_delivered < 1 {
 expect_payment_sent!(nodes[0], payment_preimage_1);
 } else {
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 }
	} else if messages_delivered == 2 {
 // nodes[0] still wants its RAA + commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, -1), (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.1 = -1;
 reconnect_args.pending_raa.1 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 3 {
 // nodes[0] still wants its commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, -1), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.1 = -1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 4 {
 // nodes[1] still wants its final RAA
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_raa.0 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 5 {
 // Everything was delivered...
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	if messages_delivered == 1 || messages_delivered == 2 {
Expand All@@ -3923,7 +3949,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	}
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	if messages_delivered > 2 {
 expect_payment_path_successful!(nodes[0]);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -597,7 +597,7 @@ fn test_onion_failure() {
 nodes[1].node.get_and_clear_pending_msg_events();
 nodes[2].node.get_and_clear_pending_msg_events();
	}, true, Some(UPDATE|20), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[2]));

	run_onion_failure_test("expiry_too_far", 0, &nodes, &route, &payment_hash, &payment_secret, |msg| {
 let session_priv = SecretKey::from_slice(&[3; 32]).unwrap();
Expand Down

16 changes: 10 additions & 6 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -490,7 +490,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
	// nodes[1] now immediately fails the HTLC as the next-hop channel is disconnected
	let _ = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[2]));

	let as_commitment_tx = get_local_commitment_txn!(nodes[0], chan_id)[0].clone();
	if confirm_before_reload {
Expand DownExpand Up@@ -789,7 +789,9 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
	nodes[0].node.test_process_background_events();
	check_added_monitors(&nodes[0], 1);

	reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	// Now resend the payment, delivering the HTLC and actually claiming it this time. This ensures
	// the payment is not (spuriously) listed as still pending.
Expand DownExpand Up@@ -817,7 +819,7 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
	nodes[0].node.test_process_background_events();
	check_added_monitors(&nodes[0], 1);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	match nodes[0].node.send_payment_with_route(&new_route, payment_hash, RecipientOnionFields::secret_only(payment_secret), payment_id) {
 Err(PaymentSendFailure::DuplicatePayment) => {},
Expand DownExpand Up@@ -1011,7 +1013,7 @@ fn test_fulfill_restart_failure() {
	reload_node!(nodes[1], &chan_manager_serialized, &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_1_deserialized);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	nodes[1].node.fail_htlc_backwards(&payment_hash);
	expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::FailedPayment { payment_hash }]);
Expand DownExpand Up@@ -3422,9 +3424,11 @@ fn do_test_payment_metadata_consistency(do_reload: bool, do_modify: bool) {
 reload_node!(nodes[3], config, &nodes[3].node.encode(), &[&mon_bd, &mon_cd],
 persister, new_chain_monitor, nodes_0_deserialized);
 nodes[1].node.peer_disconnected(&nodes[3].node.get_our_node_id());
 reconnect_nodes(&nodes[1], &nodes[3], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[3]));
	}
	reconnect_nodes(&nodes[2], &nodes[3], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[2], &nodes[3]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	// Create a new channel between C and D as A will refuse to retry on the existing one because
	// it just failed.
Expand Down

22 changes: 13 additions & 9 deletions
lightning/src/ln/reload_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,9 @@ fn test_funding_peer_disconnect() {
	let events_1 = nodes[0].node.get_and_clear_pending_msg_events();
	assert!(events_1.is_empty());

	reconnect_nodes(&nodes[0], &nodes[1], (false, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready.1 = true;
	reconnect_nodes(reconnect_args);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -180,7 +182,7 @@ fn test_funding_peer_disconnect() {

	reload_node!(nodes[0], &nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
}

#[test]
Expand DownExpand Up@@ -334,7 +336,7 @@ fn test_simple_manager_serialize_deserialize() {
	let chan_0_monitor_serialized = get_monitor!(nodes[0], chan_id).encode();
	reload_node!(nodes[0], nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	fail_payment(&nodes[0], &[&nodes[1]], our_payment_hash);
	claim_payment(&nodes[0], &[&nodes[1]], our_payment_preimage);
Expand DownExpand Up@@ -456,8 +458,8 @@ fn test_manager_serialize_deserialize_inconsistent_monitor() {
	check_added_monitors!(nodes[0], 1);

	// nodes[1] and nodes[2] have no lost state with nodes[0]...
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(&nodes[0], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[2]));
	//... and we can even still claim the payment!
	claim_payment(&nodes[2], &[&nodes[0], &nodes[1]], our_payment_preimage);

Expand DownExpand Up@@ -666,10 +668,12 @@ fn test_forwardable_regen() {
	let chan_1_monitor_serialized = get_monitor!(nodes[1], chan_id_2).encode();
	reload_node!(nodes[1], nodes[1].node.encode(), &[&chan_0_monitor_serialized, &chan_1_monitor_serialized], persister, new_chain_monitor, nodes_1_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	// Note that nodes[1] and nodes[2] resend their channel_ready here since they haven't updated
	// the commitment state.
	reconnect_nodes(&nodes[1], &nodes[2], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

Expand DownExpand Up@@ -967,7 +971,7 @@ fn do_forwarded_payment_no_manager_persistence(use_cs_commitment: bool, claim_ht
	check_added_monitors!(nodes[1], 1);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	if use_cs_commitment {
 // If we confirm a commitment transaction that has the HTLC on-chain, nodes[1] should wait
Expand DownExpand Up@@ -1085,7 +1089,7 @@ fn removed_payment_no_manager_persistence() {
	// now forgotten everywhere. The ChannelManager should have, as a side-effect of reload,
	// learned that the HTLC is gone from the ChannelMonitor and added it to the to-fail-back set.
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], [HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
	check_added_monitors!(nodes[1], 1);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Struct-ify `reconnect_nodes` test util args by valentinewallace · Pull Request #2459 · lightningdevkit/rust-lightning · GitHub
Skip to content
Struct-ify reconnect_nodes test util args#2459

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

tnull
merged 1 commit into

from

Jul 31, 2023
 Merged


Struct-ify reconnect_nodes test util args
#2459
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


18 changes: 13 additions & 5 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,7 +178,9 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.send_channel_ready = (true, true);
 reconnect_nodes(reconnect_args);
	}

	chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
Expand DownExpand Up@@ -233,7 +235,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	// ...and make sure we can force-close a frozen channel
Expand DownExpand Up@@ -1925,7 +1927,9 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:
	// Make sure nodes[1] isn't stupid enough to re-send the ChannelReady on reconnect
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, confirm_a_first), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready.1 = confirm_a_first;
	reconnect_nodes(reconnect_args);

	// But we want to re-emit ChannelPending
	expect_channel_pending_event(&nodes[1], &nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -2575,10 +2579,14 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
	nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	if second_fails {
 reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (1, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
 reconnect_args.pending_htlc_fails.0 = 1;
 reconnect_nodes(reconnect_args);
 expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
	} else {
 reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
 reconnect_args.pending_htlc_claims.0 = 1;
 reconnect_nodes(reconnect_args);
	}

	if htlc_status == HTLCStatusAtDupClaim::HoldingCell {
Expand Down

34 changes: 33 additions & 1 deletion
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2945,9 +2945,41 @@ macro_rules! handle_chan_reestablish_msgs {
	}
}

pub struct ReconnectArgs<'a, 'b, 'c, 'd> {
	pub node_a: &'a Node<'b, 'c, 'd>,
	pub node_b: &'a Node<'b, 'c, 'd>,
	pub send_channel_ready: (bool, bool),
	pub pending_htlc_adds: (i64, i64),
	pub pending_htlc_claims: (usize, usize),
	pub pending_htlc_fails: (usize, usize),
	pub pending_cell_htlc_claims: (usize, usize),
	pub pending_cell_htlc_fails: (usize, usize),
	pub pending_raa: (bool, bool),
}

impl<'a, 'b, 'c, 'd> ReconnectArgs<'a, 'b, 'c, 'd> {
	pub fn new(node_a: &'a Node<'b, 'c, 'd>, node_b: &'a Node<'b, 'c, 'd>) -> Self {
 Self {
 node_a,
 node_b,
 send_channel_ready: (false, false),
 pending_htlc_adds: (0, 0),
 pending_htlc_claims: (0, 0),
 pending_htlc_fails: (0, 0),
 pending_cell_htlc_claims: (0, 0),
 pending_cell_htlc_fails: (0, 0),
 pending_raa: (false, false),
 }
	}
}

/// pending_htlc_adds includes both the holding cell and in-flight update_add_htlcs, whereas
/// for claims/fails they are separated out.
pub fn reconnect_nodes<'a, 'b, 'c>(node_a: &Node<'a, 'b, 'c>, node_b: &Node<'a, 'b, 'c>, send_channel_ready: (bool, bool), pending_htlc_adds: (i64, i64), pending_htlc_claims: (usize, usize), pending_htlc_fails: (usize, usize), pending_cell_htlc_claims: (usize, usize), pending_cell_htlc_fails: (usize, usize), pending_raa: (bool, bool)) {
pub fn reconnect_nodes<'a, 'b, 'c, 'd>(args: ReconnectArgs<'a, 'b, 'c, 'd>) {
	let ReconnectArgs {
 node_a, node_b, send_channel_ready, pending_htlc_adds, pending_htlc_claims, pending_htlc_fails,
 pending_cell_htlc_claims, pending_cell_htlc_fails, pending_raa
	} = args;
	node_a.node.peer_connected(&node_b.node.get_our_node_id(), &msgs::Init {
 features: node_b.node.init_features(), networks: None, remote_network_address: None
	}, true).unwrap();
Expand Down

58 changes: 42 additions & 16 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3585,7 +3585,9 @@ fn test_dup_events_on_peer_disconnect() {
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.pending_htlc_claims.0 = 1;
	reconnect_nodes(reconnect_args);
	expect_payment_path_successful!(nodes[0]);
}

Expand DownExpand Up@@ -3642,7 +3644,9 @@ fn test_simple_peer_disconnect() {

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	let payment_preimage_1 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
	let payment_hash_2 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).1;
Expand All@@ -3651,7 +3655,7 @@ fn test_simple_peer_disconnect() {

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	let (payment_preimage_3, payment_hash_3, _) = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000);
	let payment_preimage_4 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
Expand All@@ -3664,7 +3668,10 @@ fn test_simple_peer_disconnect() {
	claim_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], true, payment_preimage_3);
	fail_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], true, payment_hash_5);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (1, 0), (1, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.pending_cell_htlc_fails.0 = 1;
	reconnect_args.pending_cell_htlc_claims.0 = 1;
	reconnect_nodes(reconnect_args);
	{
 let events = nodes[0].node.get_and_clear_pending_events();
 assert_eq!(events.len(), 4);
Expand DownExpand Up@@ -3776,19 +3783,29 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
 }
 // Even if the channel_ready messages get exchanged, as long as nothing further was
 // received on either side, both sides will need to resend them.
 reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 1), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.send_channel_ready = (true, true);
 reconnect_args.pending_htlc_adds.1 = 1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 3 {
 // nodes[0] still wants its RAA + commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (-1, 0), (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.0 = -1;
 reconnect_args.pending_raa.0 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 4 {
 // nodes[0] still wants its commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (-1, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.0 = -1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 5 {
 // nodes[1] still wants its final RAA
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_raa.1 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 6 {
 // Everything was delivered...
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	let events_1 = nodes[1].node.get_and_clear_pending_events();
Expand All@@ -3812,7 +3829,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	nodes[1].node.process_pending_htlc_forwards();

Expand DownExpand Up@@ -3896,24 +3913,33 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	if messages_delivered < 2 {
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (1, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_claims.0 = 1;
 reconnect_nodes(reconnect_args);
 if messages_delivered < 1 {
 expect_payment_sent!(nodes[0], payment_preimage_1);
 } else {
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 }
	} else if messages_delivered == 2 {
 // nodes[0] still wants its RAA + commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, -1), (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.1 = -1;
 reconnect_args.pending_raa.1 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 3 {
 // nodes[0] still wants its commitment_signed
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, -1), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_htlc_adds.1 = -1;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 4 {
 // nodes[1] still wants its final RAA
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 reconnect_args.pending_raa.0 = true;
 reconnect_nodes(reconnect_args);
	} else if messages_delivered == 5 {
 // Everything was delivered...
 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	}

	if messages_delivered == 1 || messages_delivered == 2 {
Expand All@@ -3923,7 +3949,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	}
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	if messages_delivered > 2 {
 expect_payment_path_successful!(nodes[0]);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -597,7 +597,7 @@ fn test_onion_failure() {
 nodes[1].node.get_and_clear_pending_msg_events();
 nodes[2].node.get_and_clear_pending_msg_events();
	}, true, Some(UPDATE|20), Some(NetworkUpdate::ChannelUpdateMessage{msg: ChannelUpdate::dummy(short_channel_id)}), Some(short_channel_id));
	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[2]));

	run_onion_failure_test("expiry_too_far", 0, &nodes, &route, &payment_hash, &payment_secret, |msg| {
 let session_priv = SecretKey::from_slice(&[3; 32]).unwrap();
Expand Down

16 changes: 10 additions & 6 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -490,7 +490,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
	// nodes[1] now immediately fails the HTLC as the next-hop channel is disconnected
	let _ = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());

	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[2]));

	let as_commitment_tx = get_local_commitment_txn!(nodes[0], chan_id)[0].clone();
	if confirm_before_reload {
Expand DownExpand Up@@ -789,7 +789,9 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
	nodes[0].node.test_process_background_events();
	check_added_monitors(&nodes[0], 1);

	reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	// Now resend the payment, delivering the HTLC and actually claiming it this time. This ensures
	// the payment is not (spuriously) listed as still pending.
Expand DownExpand Up@@ -817,7 +819,7 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
	nodes[0].node.test_process_background_events();
	check_added_monitors(&nodes[0], 1);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	match nodes[0].node.send_payment_with_route(&new_route, payment_hash, RecipientOnionFields::secret_only(payment_secret), payment_id) {
 Err(PaymentSendFailure::DuplicatePayment) => {},
Expand DownExpand Up@@ -1011,7 +1013,7 @@ fn test_fulfill_restart_failure() {
	reload_node!(nodes[1], &chan_manager_serialized, &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_1_deserialized);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	nodes[1].node.fail_htlc_backwards(&payment_hash);
	expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::FailedPayment { payment_hash }]);
Expand DownExpand Up@@ -3422,9 +3424,11 @@ fn do_test_payment_metadata_consistency(do_reload: bool, do_modify: bool) {
 reload_node!(nodes[3], config, &nodes[3].node.encode(), &[&mon_bd, &mon_cd],
 persister, new_chain_monitor, nodes_0_deserialized);
 nodes[1].node.peer_disconnected(&nodes[3].node.get_our_node_id());
 reconnect_nodes(&nodes[1], &nodes[3], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 reconnect_nodes(ReconnectArgs::new(&nodes[1], &nodes[3]));
	}
	reconnect_nodes(&nodes[2], &nodes[3], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[2], &nodes[3]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	// Create a new channel between C and D as A will refuse to retry on the existing one because
	// it just failed.
Expand Down

22 changes: 13 additions & 9 deletions
lightning/src/ln/reload_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,9 @@ fn test_funding_peer_disconnect() {
	let events_1 = nodes[0].node.get_and_clear_pending_msg_events();
	assert!(events_1.is_empty());

	reconnect_nodes(&nodes[0], &nodes[1], (false, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
	reconnect_args.send_channel_ready.1 = true;
	reconnect_nodes(reconnect_args);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
Expand DownExpand Up@@ -180,7 +182,7 @@ fn test_funding_peer_disconnect() {

	reload_node!(nodes[0], &nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
}

#[test]
Expand DownExpand Up@@ -334,7 +336,7 @@ fn test_simple_manager_serialize_deserialize() {
	let chan_0_monitor_serialized = get_monitor!(nodes[0], chan_id).encode();
	reload_node!(nodes[0], nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	fail_payment(&nodes[0], &[&nodes[1]], our_payment_hash);
	claim_payment(&nodes[0], &[&nodes[1]], our_payment_preimage);
Expand DownExpand Up@@ -456,8 +458,8 @@ fn test_manager_serialize_deserialize_inconsistent_monitor() {
	check_added_monitors!(nodes[0], 1);

	// nodes[1] and nodes[2] have no lost state with nodes[0]...
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(&nodes[0], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[2]));
	//... and we can even still claim the payment!
	claim_payment(&nodes[2], &[&nodes[0], &nodes[1]], our_payment_preimage);

Expand DownExpand Up@@ -666,10 +668,12 @@ fn test_forwardable_regen() {
	let chan_1_monitor_serialized = get_monitor!(nodes[1], chan_id_2).encode();
	reload_node!(nodes[1], nodes[1].node.encode(), &[&chan_0_monitor_serialized, &chan_1_monitor_serialized], persister, new_chain_monitor, nodes_1_deserialized);

	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
	// Note that nodes[1] and nodes[2] resend their channel_ready here since they haven't updated
	// the commitment state.
	reconnect_nodes(&nodes[1], &nodes[2], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
	reconnect_args.send_channel_ready = (true, true);
	reconnect_nodes(reconnect_args);

	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

Expand DownExpand Up@@ -967,7 +971,7 @@ fn do_forwarded_payment_no_manager_persistence(use_cs_commitment: bool, claim_ht
	check_added_monitors!(nodes[1], 1);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	if use_cs_commitment {
 // If we confirm a commitment transaction that has the HTLC on-chain, nodes[1] should wait
Expand DownExpand Up@@ -1085,7 +1089,7 @@ fn removed_payment_no_manager_persistence() {
	// now forgotten everywhere. The ChannelManager should have, as a side-effect of reload,
	// learned that the HTLC is gone from the ChannelMonitor and added it to the to-fail-back set.
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
	reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));

	expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], [HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
	check_added_monitors!(nodes[1], 1);
Expand Down