Fix (and DRY) the conditionals before calling peer_disconnected#2035

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
TheBlueMatt merged 6 commits into from
Feb 21, 2023
Merged

Fix (and DRY) the conditionals before calling peer_disconnected #2035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3554678
Fix (and DRY) the conditionals before calling `peer_disconnected`
TheBlueMatt Feb 15, 2023
73e2fdf
Add test of an initial message other than `Init`
TheBlueMatt Feb 15, 2023
ca1b8bd
Correct the "is peer live" checks in `PeerManager`
TheBlueMatt Feb 15, 2023
10e0633
Correct `funding_transaction_generated` err msg and fix fuzz check
TheBlueMatt Feb 15, 2023
0f07d5c
Add a further debug_assert that disconnecting peers are connected
TheBlueMatt Feb 15, 2023
be6f263
Remove the `peer_disconnected` `no_connection_possible` flag
TheBlueMatt Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -978,16 +978,16 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {

0x0c => {
if !chan_a_disconnected {
nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
nodes[0].peer_disconnected(&nodes[1].get_our_node_id());
nodes[1].peer_disconnected(&nodes[0].get_our_node_id());
chan_a_disconnected = true;
drain_msg_events_on_disconnect!(0);
}
},
0x0d => {
if !chan_b_disconnected {
nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
nodes[1].peer_disconnected(&nodes[2].get_our_node_id());
nodes[2].peer_disconnected(&nodes[1].get_our_node_id());
chan_b_disconnected = true;
drain_msg_events_on_disconnect!(2);
}
Expand DownExpand Up@@ -1039,7 +1039,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {

0x2c => {
if !chan_a_disconnected {
nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
nodes[1].peer_disconnected(&nodes[0].get_our_node_id());
chan_a_disconnected = true;
drain_msg_events_on_disconnect!(0);
}
Expand All@@ -1053,14 +1053,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
},
0x2d => {
if !chan_a_disconnected {
nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
nodes[0].peer_disconnected(&nodes[1].get_our_node_id());
chan_a_disconnected = true;
nodes[0].get_and_clear_pending_msg_events();
ab_events.clear();
ba_events.clear();
}
if !chan_b_disconnected {
nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
nodes[2].peer_disconnected(&nodes[1].get_our_node_id());
chan_b_disconnected = true;
nodes[2].get_and_clear_pending_msg_events();
bc_events.clear();
Expand All@@ -1072,7 +1072,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
},
0x2e => {
if !chan_b_disconnected {
nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
nodes[1].peer_disconnected(&nodes[2].get_our_node_id());
chan_b_disconnected = true;
drain_msg_events_on_disconnect!(2);
}
Expand Down
6 changes: 1 addition & 5 deletions fuzz/src/full_stack.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -634,11 +634,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
if let Err(e) = channelmanager.funding_transaction_generated(&funding_generation.0, &funding_generation.1, tx.clone()) {
// It's possible the channel has been closed in the mean time, but any other
// failure may be a bug.
if let APIError::ChannelUnavailable { err } = e {
if !err.starts_with("Can't find a peer matching the passed counterparty node_id ") {
assert_eq!(err, "No such channel");
}
} else { panic!(); }
if let APIError::ChannelUnavailable { .. } = e { } else { panic!(); }
}
pending_funding_signatures.insert(funding_output, tx);
}
Expand Down
4 changes: 2 additions & 2 deletions lightning-invoice/src/utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -842,13 +842,13 @@ mod test {

// With only one sufficient-value peer connected we should only get its hint
scid_aliases.remove(&chan_b.0.short_channel_id_alias.unwrap());
nodes[0].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
nodes[0].node.peer_disconnected(&nodes[2].node.get_our_node_id());
match_invoice_routes(Some(1_000_000_000), &nodes[0], scid_aliases.clone());

// If we don't have any sufficient-value peers connected we should get all hints with
// sufficient value, even though there is a connected insufficient-value peer.
scid_aliases.insert(chan_b.0.short_channel_id_alias.unwrap());
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
match_invoice_routes(Some(1_000_000_000), &nodes[0], scid_aliases);
}

Expand Down
2 changes: 1 addition & 1 deletion lightning-net-tokio/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -643,7 +643,7 @@ mod tests {
fn handle_update_fee(&self, _their_node_id: &PublicKey, _msg: &UpdateFee) {}
fn handle_announcement_signatures(&self, _their_node_id: &PublicKey, _msg: &AnnouncementSignatures) {}
fn handle_channel_update(&self, _their_node_id: &PublicKey, _msg: &ChannelUpdate) {}
fn peer_disconnected(&self, their_node_id: &PublicKey, _no_connection_possible: bool) {
fn peer_disconnected(&self, their_node_id: &PublicKey) {
if *their_node_id == self.expected_pubkey {
self.disconnected_flag.store(true, Ordering::SeqCst);
self.pubkey_disconnected.clone().try_send(()).unwrap();
Expand Down
52 changes: 26 additions & 26 deletions lightning/src/ln/chanmon_update_fail_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,8 +181,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
assert_eq!(nodes[0].node.list_channels().len(), 1);

if disconnect {
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
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));
}

Expand DownExpand Up@@ -234,8 +234,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
assert_eq!(nodes[0].node.list_channels().len(), 1);

if disconnect {
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
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));
}

Expand DownExpand Up@@ -337,8 +337,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
};

if disconnect_count & !disconnect_flags > 0 {
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
}

// Now fix monitor updating...
Expand All@@ -348,8 +348,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
check_added_monitors!(nodes[0], 0);

macro_rules! disconnect_reconnect_peers { () => { {
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
let reestablish_1 = get_chan_reestablish_msgs!(nodes[0], nodes[1]);
Expand DownExpand Up@@ -1110,8 +1110,8 @@ fn test_monitor_update_fail_reestablish() {

let (payment_preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);

nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());

nodes[2].node.claim_funds(payment_preimage);
check_added_monitors!(nodes[2], 1);
Expand DownExpand Up@@ -1146,8 +1146,8 @@ fn test_monitor_update_fail_reestablish() {
nodes[1].node.get_and_clear_pending_msg_events(); // Free the holding cell
check_added_monitors!(nodes[1], 1);

nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());

nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -1315,8 +1315,8 @@ fn claim_while_disconnected_monitor_update_fail() {
// Forward a payment for B to claim
let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);

nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

nodes[1].node.claim_funds(payment_preimage_1);
check_added_monitors!(nodes[1], 1);
Expand DownExpand Up@@ -1451,8 +1451,8 @@ fn monitor_failed_no_reestablish_response() {

// Now disconnect and immediately reconnect, delivering the channel_reestablish while nodes[1]
// is still failing to update monitors.
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -1873,8 +1873,8 @@ 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(), false);
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
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));
assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
Expand DownExpand Up@@ -2041,8 +2041,8 @@ fn test_pending_update_fee_ack_on_reconnect() {
let bs_first_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
// bs_first_raa is not delivered until it is re-generated after reconnect

nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
Expand DownExpand Up@@ -2169,8 +2169,8 @@ fn do_update_fee_resend_test(deliver_update: bool, parallel_updates: bool) {
assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
}

nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
Expand DownExpand Up@@ -2303,9 +2303,9 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
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);
} else {
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
}
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

// Now reconnect the two
nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -2493,8 +2493,8 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
}

nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
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));
Expand Down
16 changes: 8 additions & 8 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2691,7 +2691,7 @@ where
(chan, funding_msg)
},
Err(_) => { return Err(APIError::ChannelUnavailable {
err: "Error deriving keys or signing initial commitment transactions - either our RNG or our counterparty's RNG is broken or the Signer refused to sign".to_owned()
err: "Signer refused to sign the initial commitment transaction".to_owned()
}) },
}
};
Expand DownExpand Up@@ -6270,13 +6270,13 @@ where
let _ = handle_error!(self, self.internal_channel_reestablish(counterparty_node_id, msg), *counterparty_node_id);
}

fn peer_disconnected(&self, counterparty_node_id: &PublicKey, no_connection_possible: bool) {
fn peer_disconnected(&self, counterparty_node_id: &PublicKey) {
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
let mut failed_channels = Vec::new();
let mut per_peer_state = self.per_peer_state.write().unwrap();
let remove_peer = {
log_debug!(self.logger, "Marking channels with {} disconnected and generating channel_updates. We believe we {} make future connections to this peer.",
log_pubkey!(counterparty_node_id), if no_connection_possible { "cannot" } else { "can" });
log_debug!(self.logger, "Marking channels with {} disconnected and generating channel_updates.",
log_pubkey!(counterparty_node_id));
if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
let peer_state = &mut *peer_state_lock;
Expand DownExpand Up@@ -6318,7 +6318,7 @@ where
debug_assert!(peer_state.is_connected, "A disconnected peer cannot disconnect");
peer_state.is_connected = false;
peer_state.ok_to_remove(true)
} else { true }
} else { debug_assert!(false, "Unconnected peer disconnected"); true }
};
if remove_peer {
per_peer_state.remove(counterparty_node_id);
Expand All@@ -6332,7 +6332,7 @@ where

fn peer_connected(&self, counterparty_node_id: &PublicKey, init_msg: &msgs::Init) -> Result<(), ()> {
if !init_msg.features.supports_static_remote_key() {
log_debug!(self.logger, "Peer {} does not support static remote key, disconnecting with no_connection_possible", log_pubkey!(counterparty_node_id));
log_debug!(self.logger, "Peer {} does not support static remote key, disconnecting", log_pubkey!(counterparty_node_id));
return Err(());
}

Expand DownExpand Up@@ -8210,8 +8210,8 @@ mod tests {

let chan = create_announced_chan_between_nodes(&nodes, 0, 1);

nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

nodes[0].node.force_close_broadcasting_latest_txn(&chan.2, &nodes[1].node.get_our_node_id()).unwrap();
check_closed_broadcast!(nodes[0], true);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix (and DRY) the conditionals before calling peer_disconnected#2035

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

TheBlueMatt
merged 6 commits into

from

Feb 21, 2023
 Merged


Fix (and DRY) the conditionals before calling peer_disconnected
#2035
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
3554678

Fix (and DRY) the conditionals before calling `peer_disconnected`


TheBlueMatt Feb 15, 2023
73e2fdf

Add test of an initial message other than `Init`


TheBlueMatt Feb 15, 2023
ca1b8bd

Correct the "is peer live" checks in `PeerManager`


TheBlueMatt Feb 15, 2023
10e0633

Correct `funding_transaction_generated` err msg and fix fuzz check


TheBlueMatt Feb 15, 2023
0f07d5c

Add a further debug_assert that disconnecting peers are connected


TheBlueMatt Feb 15, 2023
be6f263

Remove the `peer_disconnected` `no_connection_possible` flag


TheBlueMatt Feb 21, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 8 additions & 8 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -978,16 +978,16 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {

 0x0c => {
 if !chan_a_disconnected {
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id());
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id());
 chan_a_disconnected = true;
 drain_msg_events_on_disconnect!(0);
 }
 },
 0x0d => {
 if !chan_b_disconnected {
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id());
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id());
 chan_b_disconnected = true;
 drain_msg_events_on_disconnect!(2);
 }
Expand DownExpand Up@@ -1039,7 +1039,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {

 0x2c => {
 if !chan_a_disconnected {
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id());
 chan_a_disconnected = true;
 drain_msg_events_on_disconnect!(0);
 }
Expand All@@ -1053,14 +1053,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 },
 0x2d => {
 if !chan_a_disconnected {
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id());
 chan_a_disconnected = true;
 nodes[0].get_and_clear_pending_msg_events();
 ab_events.clear();
 ba_events.clear();
 }
 if !chan_b_disconnected {
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id());
 chan_b_disconnected = true;
 nodes[2].get_and_clear_pending_msg_events();
 bc_events.clear();
Expand All@@ -1072,7 +1072,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 },
 0x2e => {
 if !chan_b_disconnected {
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id());
 chan_b_disconnected = true;
 drain_msg_events_on_disconnect!(2);
 }
Expand Down

6 changes: 1 addition & 5 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,11 +634,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 if let Err(e) = channelmanager.funding_transaction_generated(&funding_generation.0, &funding_generation.1, tx.clone()) {
 // It's possible the channel has been closed in the mean time, but any other
 // failure may be a bug.
 if let APIError::ChannelUnavailable { err } = e {
 if !err.starts_with("Can't find a peer matching the passed counterparty node_id ") {
 assert_eq!(err, "No such channel");
 }
 } else { panic!(); }
 if let APIError::ChannelUnavailable { .. } = e { } else { panic!(); }
 }
 pending_funding_signatures.insert(funding_output, tx);
 }
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -842,13 +842,13 @@ mod test {

 // With only one sufficient-value peer connected we should only get its hint
 scid_aliases.remove(&chan_b.0.short_channel_id_alias.unwrap());
 nodes[0].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[2].node.get_our_node_id());
 match_invoice_routes(Some(1_000_000_000), &nodes[0], scid_aliases.clone());

 // If we don't have any sufficient-value peers connected we should get all hints with
 // sufficient value, even though there is a connected insufficient-value peer.
 scid_aliases.insert(chan_b.0.short_channel_id_alias.unwrap());
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 match_invoice_routes(Some(1_000_000_000), &nodes[0], scid_aliases);
	}

Expand Down

2 changes: 1 addition & 1 deletion
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -643,7 +643,7 @@ mod tests {
 fn handle_update_fee(&self, _their_node_id: &PublicKey, _msg: &UpdateFee) {}
 fn handle_announcement_signatures(&self, _their_node_id: &PublicKey, _msg: &AnnouncementSignatures) {}
 fn handle_channel_update(&self, _their_node_id: &PublicKey, _msg: &ChannelUpdate) {}
 fn peer_disconnected(&self, their_node_id: &PublicKey, _no_connection_possible: bool) {
 fn peer_disconnected(&self, their_node_id: &PublicKey) {
 if *their_node_id == self.expected_pubkey {
 self.disconnected_flag.store(true, Ordering::SeqCst);
 self.pubkey_disconnected.clone().try_send(()).unwrap();
Expand Down

52 changes: 26 additions & 26 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,8 +181,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	assert_eq!(nodes[0].node.list_channels().len(), 1);

	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 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));
	}

Expand DownExpand Up@@ -234,8 +234,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	assert_eq!(nodes[0].node.list_channels().len(), 1);

	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 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));
	}

Expand DownExpand Up@@ -337,8 +337,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	};

	if disconnect_count & !disconnect_flags > 0 {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	}

	// Now fix monitor updating...
Expand All@@ -348,8 +348,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	check_added_monitors!(nodes[0], 0);

	macro_rules! disconnect_reconnect_peers { () => { {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
 let reestablish_1 = get_chan_reestablish_msgs!(nodes[0], nodes[1]);
Expand DownExpand Up@@ -1110,8 +1110,8 @@ fn test_monitor_update_fail_reestablish() {

	let (payment_preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);

	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	nodes[2].node.claim_funds(payment_preimage);
	check_added_monitors!(nodes[2], 1);
Expand DownExpand Up@@ -1146,8 +1146,8 @@ fn test_monitor_update_fail_reestablish() {
	nodes[1].node.get_and_clear_pending_msg_events(); // Free the holding cell
	check_added_monitors!(nodes[1], 1);

	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -1315,8 +1315,8 @@ fn claim_while_disconnected_monitor_update_fail() {
	// Forward a payment for B to claim
	let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[1].node.claim_funds(payment_preimage_1);
	check_added_monitors!(nodes[1], 1);
Expand DownExpand Up@@ -1451,8 +1451,8 @@ fn monitor_failed_no_reestablish_response() {

	// Now disconnect and immediately reconnect, delivering the channel_reestablish while nodes[1]
	// is still failing to update monitors.
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -1873,8 +1873,8 @@ 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(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	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));
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
Expand DownExpand Up@@ -2041,8 +2041,8 @@ fn test_pending_update_fee_ack_on_reconnect() {
	let bs_first_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
	// bs_first_raa is not delivered until it is re-generated after reconnect

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
Expand DownExpand Up@@ -2169,8 +2169,8 @@ fn do_update_fee_resend_test(deliver_update: bool, parallel_updates: bool) {
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	}

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
Expand DownExpand Up@@ -2303,9 +2303,9 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
 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);
 } else {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 }
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 // Now reconnect the two
 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -2493,8 +2493,8 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
	}

	nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
	nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
	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));
Expand Down

16 changes: 8 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2691,7 +2691,7 @@ where
 (chan, funding_msg)
 },
 Err(_) => { return Err(APIError::ChannelUnavailable {
 err: "Error deriving keys or signing initial commitment transactions - either our RNG or our counterparty's RNG is broken or the Signer refused to sign".to_owned()
 err: "Signer refused to sign the initial commitment transaction".to_owned()
 }) },
 }
 };
Expand DownExpand Up@@ -6270,13 +6270,13 @@ where
 let _ = handle_error!(self, self.internal_channel_reestablish(counterparty_node_id, msg), *counterparty_node_id);
	}

	fn peer_disconnected(&self, counterparty_node_id: &PublicKey, no_connection_possible: bool) {
	fn peer_disconnected(&self, counterparty_node_id: &PublicKey) {
 let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
 let mut failed_channels = Vec::new();
 let mut per_peer_state = self.per_peer_state.write().unwrap();
 let remove_peer = {
 log_debug!(self.logger, "Marking channels with {} disconnected and generating channel_updates. We believe we {} make future connections to this peer.",
 log_pubkey!(counterparty_node_id), if no_connection_possible { "cannot" } else { "can" });
 log_debug!(self.logger, "Marking channels with {} disconnected and generating channel_updates.",
 log_pubkey!(counterparty_node_id));
 if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
Expand DownExpand Up@@ -6318,7 +6318,7 @@ where
 debug_assert!(peer_state.is_connected, "A disconnected peer cannot disconnect");
 peer_state.is_connected = false;
 peer_state.ok_to_remove(true)
 } else { true }
 } else { debug_assert!(false, "Unconnected peer disconnected"); true }
 };
 if remove_peer {
 per_peer_state.remove(counterparty_node_id);
Expand All@@ -6332,7 +6332,7 @@ where

	fn peer_connected(&self, counterparty_node_id: &PublicKey, init_msg: &msgs::Init) -> Result<(), ()> {
 if !init_msg.features.supports_static_remote_key() {
 log_debug!(self.logger, "Peer {} does not support static remote key, disconnecting with no_connection_possible", log_pubkey!(counterparty_node_id));
 log_debug!(self.logger, "Peer {} does not support static remote key, disconnecting", log_pubkey!(counterparty_node_id));
 return Err(());
 }

Expand DownExpand Up@@ -8210,8 +8210,8 @@ mod tests {

 let chan = create_announced_chan_between_nodes(&nodes, 0, 1);

 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 nodes[0].node.force_close_broadcasting_latest_txn(&chan.2, &nodes[1].node.get_our_node_id()).unwrap();
 check_closed_broadcast!(nodes[0], true);
Expand Down
Loading

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

Skip to content
Fix (and DRY) the conditionals before calling peer_disconnected#2035

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

TheBlueMatt
merged 6 commits into

from

Feb 21, 2023
 Merged


Fix (and DRY) the conditionals before calling peer_disconnected
#2035
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
3554678

Fix (and DRY) the conditionals before calling `peer_disconnected`


TheBlueMatt Feb 15, 2023
73e2fdf

Add test of an initial message other than `Init`


TheBlueMatt Feb 15, 2023
ca1b8bd

Correct the "is peer live" checks in `PeerManager`


TheBlueMatt Feb 15, 2023
10e0633

Correct `funding_transaction_generated` err msg and fix fuzz check


TheBlueMatt Feb 15, 2023
0f07d5c

Add a further debug_assert that disconnecting peers are connected


TheBlueMatt Feb 15, 2023
be6f263

Remove the `peer_disconnected` `no_connection_possible` flag


TheBlueMatt Feb 21, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 8 additions & 8 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -978,16 +978,16 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {

 0x0c => {
 if !chan_a_disconnected {
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id());
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id());
 chan_a_disconnected = true;
 drain_msg_events_on_disconnect!(0);
 }
 },
 0x0d => {
 if !chan_b_disconnected {
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id());
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id());
 chan_b_disconnected = true;
 drain_msg_events_on_disconnect!(2);
 }
Expand DownExpand Up@@ -1039,7 +1039,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {

 0x2c => {
 if !chan_a_disconnected {
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id());
 chan_a_disconnected = true;
 drain_msg_events_on_disconnect!(0);
 }
Expand All@@ -1053,14 +1053,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 },
 0x2d => {
 if !chan_a_disconnected {
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id());
 chan_a_disconnected = true;
 nodes[0].get_and_clear_pending_msg_events();
 ab_events.clear();
 ba_events.clear();
 }
 if !chan_b_disconnected {
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id());
 chan_b_disconnected = true;
 nodes[2].get_and_clear_pending_msg_events();
 bc_events.clear();
Expand All@@ -1072,7 +1072,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 },
 0x2e => {
 if !chan_b_disconnected {
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id());
 chan_b_disconnected = true;
 drain_msg_events_on_disconnect!(2);
 }
Expand Down

6 changes: 1 addition & 5 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,11 +634,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 if let Err(e) = channelmanager.funding_transaction_generated(&funding_generation.0, &funding_generation.1, tx.clone()) {
 // It's possible the channel has been closed in the mean time, but any other
 // failure may be a bug.
 if let APIError::ChannelUnavailable { err } = e {
 if !err.starts_with("Can't find a peer matching the passed counterparty node_id ") {
 assert_eq!(err, "No such channel");
 }
 } else { panic!(); }
 if let APIError::ChannelUnavailable { .. } = e { } else { panic!(); }
 }
 pending_funding_signatures.insert(funding_output, tx);
 }
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -842,13 +842,13 @@ mod test {

 // With only one sufficient-value peer connected we should only get its hint
 scid_aliases.remove(&chan_b.0.short_channel_id_alias.unwrap());
 nodes[0].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[2].node.get_our_node_id());
 match_invoice_routes(Some(1_000_000_000), &nodes[0], scid_aliases.clone());

 // If we don't have any sufficient-value peers connected we should get all hints with
 // sufficient value, even though there is a connected insufficient-value peer.
 scid_aliases.insert(chan_b.0.short_channel_id_alias.unwrap());
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 match_invoice_routes(Some(1_000_000_000), &nodes[0], scid_aliases);
	}

Expand Down

2 changes: 1 addition & 1 deletion
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -643,7 +643,7 @@ mod tests {
 fn handle_update_fee(&self, _their_node_id: &PublicKey, _msg: &UpdateFee) {}
 fn handle_announcement_signatures(&self, _their_node_id: &PublicKey, _msg: &AnnouncementSignatures) {}
 fn handle_channel_update(&self, _their_node_id: &PublicKey, _msg: &ChannelUpdate) {}
 fn peer_disconnected(&self, their_node_id: &PublicKey, _no_connection_possible: bool) {
 fn peer_disconnected(&self, their_node_id: &PublicKey) {
 if *their_node_id == self.expected_pubkey {
 self.disconnected_flag.store(true, Ordering::SeqCst);
 self.pubkey_disconnected.clone().try_send(()).unwrap();
Expand Down

52 changes: 26 additions & 26 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,8 +181,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	assert_eq!(nodes[0].node.list_channels().len(), 1);

	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 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));
	}

Expand DownExpand Up@@ -234,8 +234,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	assert_eq!(nodes[0].node.list_channels().len(), 1);

	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 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));
	}

Expand DownExpand Up@@ -337,8 +337,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	};

	if disconnect_count & !disconnect_flags > 0 {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	}

	// Now fix monitor updating...
Expand All@@ -348,8 +348,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	check_added_monitors!(nodes[0], 0);

	macro_rules! disconnect_reconnect_peers { () => { {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
 let reestablish_1 = get_chan_reestablish_msgs!(nodes[0], nodes[1]);
Expand DownExpand Up@@ -1110,8 +1110,8 @@ fn test_monitor_update_fail_reestablish() {

	let (payment_preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);

	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	nodes[2].node.claim_funds(payment_preimage);
	check_added_monitors!(nodes[2], 1);
Expand DownExpand Up@@ -1146,8 +1146,8 @@ fn test_monitor_update_fail_reestablish() {
	nodes[1].node.get_and_clear_pending_msg_events(); // Free the holding cell
	check_added_monitors!(nodes[1], 1);

	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -1315,8 +1315,8 @@ fn claim_while_disconnected_monitor_update_fail() {
	// Forward a payment for B to claim
	let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[1].node.claim_funds(payment_preimage_1);
	check_added_monitors!(nodes[1], 1);
Expand DownExpand Up@@ -1451,8 +1451,8 @@ fn monitor_failed_no_reestablish_response() {

	// Now disconnect and immediately reconnect, delivering the channel_reestablish while nodes[1]
	// is still failing to update monitors.
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -1873,8 +1873,8 @@ 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(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	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));
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
Expand DownExpand Up@@ -2041,8 +2041,8 @@ fn test_pending_update_fee_ack_on_reconnect() {
	let bs_first_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
	// bs_first_raa is not delivered until it is re-generated after reconnect

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
Expand DownExpand Up@@ -2169,8 +2169,8 @@ fn do_update_fee_resend_test(deliver_update: bool, parallel_updates: bool) {
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	}

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
Expand DownExpand Up@@ -2303,9 +2303,9 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
 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);
 } else {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 }
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 // Now reconnect the two
 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -2493,8 +2493,8 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
	}

	nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
	nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
	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));
Expand Down

16 changes: 8 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2691,7 +2691,7 @@ where
 (chan, funding_msg)
 },
 Err(_) => { return Err(APIError::ChannelUnavailable {
 err: "Error deriving keys or signing initial commitment transactions - either our RNG or our counterparty's RNG is broken or the Signer refused to sign".to_owned()
 err: "Signer refused to sign the initial commitment transaction".to_owned()
 }) },
 }
 };
Expand DownExpand Up@@ -6270,13 +6270,13 @@ where
 let _ = handle_error!(self, self.internal_channel_reestablish(counterparty_node_id, msg), *counterparty_node_id);
	}

	fn peer_disconnected(&self, counterparty_node_id: &PublicKey, no_connection_possible: bool) {
	fn peer_disconnected(&self, counterparty_node_id: &PublicKey) {
 let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
 let mut failed_channels = Vec::new();
 let mut per_peer_state = self.per_peer_state.write().unwrap();
 let remove_peer = {
 log_debug!(self.logger, "Marking channels with {} disconnected and generating channel_updates. We believe we {} make future connections to this peer.",
 log_pubkey!(counterparty_node_id), if no_connection_possible { "cannot" } else { "can" });
 log_debug!(self.logger, "Marking channels with {} disconnected and generating channel_updates.",
 log_pubkey!(counterparty_node_id));
 if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
Expand DownExpand Up@@ -6318,7 +6318,7 @@ where
 debug_assert!(peer_state.is_connected, "A disconnected peer cannot disconnect");
 peer_state.is_connected = false;
 peer_state.ok_to_remove(true)
 } else { true }
 } else { debug_assert!(false, "Unconnected peer disconnected"); true }
 };
 if remove_peer {
 per_peer_state.remove(counterparty_node_id);
Expand All@@ -6332,7 +6332,7 @@ where

	fn peer_connected(&self, counterparty_node_id: &PublicKey, init_msg: &msgs::Init) -> Result<(), ()> {
 if !init_msg.features.supports_static_remote_key() {
 log_debug!(self.logger, "Peer {} does not support static remote key, disconnecting with no_connection_possible", log_pubkey!(counterparty_node_id));
 log_debug!(self.logger, "Peer {} does not support static remote key, disconnecting", log_pubkey!(counterparty_node_id));
 return Err(());
 }

Expand DownExpand Up@@ -8210,8 +8210,8 @@ mod tests {

 let chan = create_announced_chan_between_nodes(&nodes, 0, 1);

 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 nodes[0].node.force_close_broadcasting_latest_txn(&chan.2, &nodes[1].node.get_our_node_id()).unwrap();
 check_closed_broadcast!(nodes[0], true);
Expand Down
Loading

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

Skip to content
Fix (and DRY) the conditionals before calling peer_disconnected#2035

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

TheBlueMatt
merged 6 commits into

from

Feb 21, 2023
 Merged


Fix (and DRY) the conditionals before calling peer_disconnected
#2035
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
3554678

Fix (and DRY) the conditionals before calling `peer_disconnected`


TheBlueMatt Feb 15, 2023
73e2fdf

Add test of an initial message other than `Init`


TheBlueMatt Feb 15, 2023
ca1b8bd

Correct the "is peer live" checks in `PeerManager`


TheBlueMatt Feb 15, 2023
10e0633

Correct `funding_transaction_generated` err msg and fix fuzz check


TheBlueMatt Feb 15, 2023
0f07d5c

Add a further debug_assert that disconnecting peers are connected


TheBlueMatt Feb 15, 2023
be6f263

Remove the `peer_disconnected` `no_connection_possible` flag


TheBlueMatt Feb 21, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 8 additions & 8 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -978,16 +978,16 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {

 0x0c => {
 if !chan_a_disconnected {
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id());
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id());
 chan_a_disconnected = true;
 drain_msg_events_on_disconnect!(0);
 }
 },
 0x0d => {
 if !chan_b_disconnected {
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id());
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id());
 chan_b_disconnected = true;
 drain_msg_events_on_disconnect!(2);
 }
Expand DownExpand Up@@ -1039,7 +1039,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {

 0x2c => {
 if !chan_a_disconnected {
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id());
 chan_a_disconnected = true;
 drain_msg_events_on_disconnect!(0);
 }
Expand All@@ -1053,14 +1053,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 },
 0x2d => {
 if !chan_a_disconnected {
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id());
 chan_a_disconnected = true;
 nodes[0].get_and_clear_pending_msg_events();
 ab_events.clear();
 ba_events.clear();
 }
 if !chan_b_disconnected {
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id());
 chan_b_disconnected = true;
 nodes[2].get_and_clear_pending_msg_events();
 bc_events.clear();
Expand All@@ -1072,7 +1072,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 },
 0x2e => {
 if !chan_b_disconnected {
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id());
 chan_b_disconnected = true;
 drain_msg_events_on_disconnect!(2);
 }
Expand Down

6 changes: 1 addition & 5 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,11 +634,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 if let Err(e) = channelmanager.funding_transaction_generated(&funding_generation.0, &funding_generation.1, tx.clone()) {
 // It's possible the channel has been closed in the mean time, but any other
 // failure may be a bug.
 if let APIError::ChannelUnavailable { err } = e {
 if !err.starts_with("Can't find a peer matching the passed counterparty node_id ") {
 assert_eq!(err, "No such channel");
 }
 } else { panic!(); }
 if let APIError::ChannelUnavailable { .. } = e { } else { panic!(); }
 }
 pending_funding_signatures.insert(funding_output, tx);
 }
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -842,13 +842,13 @@ mod test {

 // With only one sufficient-value peer connected we should only get its hint
 scid_aliases.remove(&chan_b.0.short_channel_id_alias.unwrap());
 nodes[0].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[2].node.get_our_node_id());
 match_invoice_routes(Some(1_000_000_000), &nodes[0], scid_aliases.clone());

 // If we don't have any sufficient-value peers connected we should get all hints with
 // sufficient value, even though there is a connected insufficient-value peer.
 scid_aliases.insert(chan_b.0.short_channel_id_alias.unwrap());
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 match_invoice_routes(Some(1_000_000_000), &nodes[0], scid_aliases);
	}

Expand Down

2 changes: 1 addition & 1 deletion
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -643,7 +643,7 @@ mod tests {
 fn handle_update_fee(&self, _their_node_id: &PublicKey, _msg: &UpdateFee) {}
 fn handle_announcement_signatures(&self, _their_node_id: &PublicKey, _msg: &AnnouncementSignatures) {}
 fn handle_channel_update(&self, _their_node_id: &PublicKey, _msg: &ChannelUpdate) {}
 fn peer_disconnected(&self, their_node_id: &PublicKey, _no_connection_possible: bool) {
 fn peer_disconnected(&self, their_node_id: &PublicKey) {
 if *their_node_id == self.expected_pubkey {
 self.disconnected_flag.store(true, Ordering::SeqCst);
 self.pubkey_disconnected.clone().try_send(()).unwrap();
Expand Down

52 changes: 26 additions & 26 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,8 +181,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	assert_eq!(nodes[0].node.list_channels().len(), 1);

	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 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));
	}

Expand DownExpand Up@@ -234,8 +234,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	assert_eq!(nodes[0].node.list_channels().len(), 1);

	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 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));
	}

Expand DownExpand Up@@ -337,8 +337,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	};

	if disconnect_count & !disconnect_flags > 0 {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	}

	// Now fix monitor updating...
Expand All@@ -348,8 +348,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	check_added_monitors!(nodes[0], 0);

	macro_rules! disconnect_reconnect_peers { () => { {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
 let reestablish_1 = get_chan_reestablish_msgs!(nodes[0], nodes[1]);
Expand DownExpand Up@@ -1110,8 +1110,8 @@ fn test_monitor_update_fail_reestablish() {

	let (payment_preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);

	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	nodes[2].node.claim_funds(payment_preimage);
	check_added_monitors!(nodes[2], 1);
Expand DownExpand Up@@ -1146,8 +1146,8 @@ fn test_monitor_update_fail_reestablish() {
	nodes[1].node.get_and_clear_pending_msg_events(); // Free the holding cell
	check_added_monitors!(nodes[1], 1);

	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -1315,8 +1315,8 @@ fn claim_while_disconnected_monitor_update_fail() {
	// Forward a payment for B to claim
	let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[1].node.claim_funds(payment_preimage_1);
	check_added_monitors!(nodes[1], 1);
Expand DownExpand Up@@ -1451,8 +1451,8 @@ fn monitor_failed_no_reestablish_response() {

	// Now disconnect and immediately reconnect, delivering the channel_reestablish while nodes[1]
	// is still failing to update monitors.
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -1873,8 +1873,8 @@ 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(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	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));
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
Expand DownExpand Up@@ -2041,8 +2041,8 @@ fn test_pending_update_fee_ack_on_reconnect() {
	let bs_first_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
	// bs_first_raa is not delivered until it is re-generated after reconnect

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
Expand DownExpand Up@@ -2169,8 +2169,8 @@ fn do_update_fee_resend_test(deliver_update: bool, parallel_updates: bool) {
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	}

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
Expand DownExpand Up@@ -2303,9 +2303,9 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
 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);
 } else {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 }
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 // Now reconnect the two
 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -2493,8 +2493,8 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
	}

	nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
	nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
	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));
Expand Down

16 changes: 8 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2691,7 +2691,7 @@ where
 (chan, funding_msg)
 },
 Err(_) => { return Err(APIError::ChannelUnavailable {
 err: "Error deriving keys or signing initial commitment transactions - either our RNG or our counterparty's RNG is broken or the Signer refused to sign".to_owned()
 err: "Signer refused to sign the initial commitment transaction".to_owned()
 }) },
 }
 };
Expand DownExpand Up@@ -6270,13 +6270,13 @@ where
 let _ = handle_error!(self, self.internal_channel_reestablish(counterparty_node_id, msg), *counterparty_node_id);
	}

	fn peer_disconnected(&self, counterparty_node_id: &PublicKey, no_connection_possible: bool) {
	fn peer_disconnected(&self, counterparty_node_id: &PublicKey) {
 let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
 let mut failed_channels = Vec::new();
 let mut per_peer_state = self.per_peer_state.write().unwrap();
 let remove_peer = {
 log_debug!(self.logger, "Marking channels with {} disconnected and generating channel_updates. We believe we {} make future connections to this peer.",
 log_pubkey!(counterparty_node_id), if no_connection_possible { "cannot" } else { "can" });
 log_debug!(self.logger, "Marking channels with {} disconnected and generating channel_updates.",
 log_pubkey!(counterparty_node_id));
 if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
Expand DownExpand Up@@ -6318,7 +6318,7 @@ where
 debug_assert!(peer_state.is_connected, "A disconnected peer cannot disconnect");
 peer_state.is_connected = false;
 peer_state.ok_to_remove(true)
 } else { true }
 } else { debug_assert!(false, "Unconnected peer disconnected"); true }
 };
 if remove_peer {
 per_peer_state.remove(counterparty_node_id);
Expand All@@ -6332,7 +6332,7 @@ where

	fn peer_connected(&self, counterparty_node_id: &PublicKey, init_msg: &msgs::Init) -> Result<(), ()> {
 if !init_msg.features.supports_static_remote_key() {
 log_debug!(self.logger, "Peer {} does not support static remote key, disconnecting with no_connection_possible", log_pubkey!(counterparty_node_id));
 log_debug!(self.logger, "Peer {} does not support static remote key, disconnecting", log_pubkey!(counterparty_node_id));
 return Err(());
 }

Expand DownExpand Up@@ -8210,8 +8210,8 @@ mod tests {

 let chan = create_announced_chan_between_nodes(&nodes, 0, 1);

 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 nodes[0].node.force_close_broadcasting_latest_txn(&chan.2, &nodes[1].node.get_our_node_id()).unwrap();
 check_closed_broadcast!(nodes[0], true);
Expand Down
Loading

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

Skip to content
Fix (and DRY) the conditionals before calling peer_disconnected#2035

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

TheBlueMatt
merged 6 commits into

from

Feb 21, 2023
 Merged


Fix (and DRY) the conditionals before calling peer_disconnected
#2035
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
3554678

Fix (and DRY) the conditionals before calling `peer_disconnected`


TheBlueMatt Feb 15, 2023
73e2fdf

Add test of an initial message other than `Init`


TheBlueMatt Feb 15, 2023
ca1b8bd

Correct the "is peer live" checks in `PeerManager`


TheBlueMatt Feb 15, 2023
10e0633

Correct `funding_transaction_generated` err msg and fix fuzz check


TheBlueMatt Feb 15, 2023
0f07d5c

Add a further debug_assert that disconnecting peers are connected


TheBlueMatt Feb 15, 2023
be6f263

Remove the `peer_disconnected` `no_connection_possible` flag


TheBlueMatt Feb 21, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 8 additions & 8 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -978,16 +978,16 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {

 0x0c => {
 if !chan_a_disconnected {
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id());
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id());
 chan_a_disconnected = true;
 drain_msg_events_on_disconnect!(0);
 }
 },
 0x0d => {
 if !chan_b_disconnected {
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id());
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id());
 chan_b_disconnected = true;
 drain_msg_events_on_disconnect!(2);
 }
Expand DownExpand Up@@ -1039,7 +1039,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {

 0x2c => {
 if !chan_a_disconnected {
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id());
 chan_a_disconnected = true;
 drain_msg_events_on_disconnect!(0);
 }
Expand All@@ -1053,14 +1053,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 },
 0x2d => {
 if !chan_a_disconnected {
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id());
 chan_a_disconnected = true;
 nodes[0].get_and_clear_pending_msg_events();
 ab_events.clear();
 ba_events.clear();
 }
 if !chan_b_disconnected {
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id());
 chan_b_disconnected = true;
 nodes[2].get_and_clear_pending_msg_events();
 bc_events.clear();
Expand All@@ -1072,7 +1072,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 },
 0x2e => {
 if !chan_b_disconnected {
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id());
 chan_b_disconnected = true;
 drain_msg_events_on_disconnect!(2);
 }
Expand Down

6 changes: 1 addition & 5 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,11 +634,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 if let Err(e) = channelmanager.funding_transaction_generated(&funding_generation.0, &funding_generation.1, tx.clone()) {
 // It's possible the channel has been closed in the mean time, but any other
 // failure may be a bug.
 if let APIError::ChannelUnavailable { err } = e {
 if !err.starts_with("Can't find a peer matching the passed counterparty node_id ") {
 assert_eq!(err, "No such channel");
 }
 } else { panic!(); }
 if let APIError::ChannelUnavailable { .. } = e { } else { panic!(); }
 }
 pending_funding_signatures.insert(funding_output, tx);
 }
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -842,13 +842,13 @@ mod test {

 // With only one sufficient-value peer connected we should only get its hint
 scid_aliases.remove(&chan_b.0.short_channel_id_alias.unwrap());
 nodes[0].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[2].node.get_our_node_id());
 match_invoice_routes(Some(1_000_000_000), &nodes[0], scid_aliases.clone());

 // If we don't have any sufficient-value peers connected we should get all hints with
 // sufficient value, even though there is a connected insufficient-value peer.
 scid_aliases.insert(chan_b.0.short_channel_id_alias.unwrap());
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 match_invoice_routes(Some(1_000_000_000), &nodes[0], scid_aliases);
	}

Expand Down

2 changes: 1 addition & 1 deletion
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -643,7 +643,7 @@ mod tests {
 fn handle_update_fee(&self, _their_node_id: &PublicKey, _msg: &UpdateFee) {}
 fn handle_announcement_signatures(&self, _their_node_id: &PublicKey, _msg: &AnnouncementSignatures) {}
 fn handle_channel_update(&self, _their_node_id: &PublicKey, _msg: &ChannelUpdate) {}
 fn peer_disconnected(&self, their_node_id: &PublicKey, _no_connection_possible: bool) {
 fn peer_disconnected(&self, their_node_id: &PublicKey) {
 if *their_node_id == self.expected_pubkey {
 self.disconnected_flag.store(true, Ordering::SeqCst);
 self.pubkey_disconnected.clone().try_send(()).unwrap();
Expand Down

52 changes: 26 additions & 26 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,8 +181,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	assert_eq!(nodes[0].node.list_channels().len(), 1);

	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 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));
	}

Expand DownExpand Up@@ -234,8 +234,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	assert_eq!(nodes[0].node.list_channels().len(), 1);

	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 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));
	}

Expand DownExpand Up@@ -337,8 +337,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	};

	if disconnect_count & !disconnect_flags > 0 {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	}

	// Now fix monitor updating...
Expand All@@ -348,8 +348,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	check_added_monitors!(nodes[0], 0);

	macro_rules! disconnect_reconnect_peers { () => { {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
 let reestablish_1 = get_chan_reestablish_msgs!(nodes[0], nodes[1]);
Expand DownExpand Up@@ -1110,8 +1110,8 @@ fn test_monitor_update_fail_reestablish() {

	let (payment_preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);

	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	nodes[2].node.claim_funds(payment_preimage);
	check_added_monitors!(nodes[2], 1);
Expand DownExpand Up@@ -1146,8 +1146,8 @@ fn test_monitor_update_fail_reestablish() {
	nodes[1].node.get_and_clear_pending_msg_events(); // Free the holding cell
	check_added_monitors!(nodes[1], 1);

	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -1315,8 +1315,8 @@ fn claim_while_disconnected_monitor_update_fail() {
	// Forward a payment for B to claim
	let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[1].node.claim_funds(payment_preimage_1);
	check_added_monitors!(nodes[1], 1);
Expand DownExpand Up@@ -1451,8 +1451,8 @@ fn monitor_failed_no_reestablish_response() {

	// Now disconnect and immediately reconnect, delivering the channel_reestablish while nodes[1]
	// is still failing to update monitors.
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -1873,8 +1873,8 @@ 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(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	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));
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
Expand DownExpand Up@@ -2041,8 +2041,8 @@ fn test_pending_update_fee_ack_on_reconnect() {
	let bs_first_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
	// bs_first_raa is not delivered until it is re-generated after reconnect

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
Expand DownExpand Up@@ -2169,8 +2169,8 @@ fn do_update_fee_resend_test(deliver_update: bool, parallel_updates: bool) {
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	}

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
Expand DownExpand Up@@ -2303,9 +2303,9 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
 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);
 } else {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 }
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 // Now reconnect the two
 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -2493,8 +2493,8 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
	}

	nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
	nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
	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));
Expand Down

16 changes: 8 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2691,7 +2691,7 @@ where
 (chan, funding_msg)
 },
 Err(_) => { return Err(APIError::ChannelUnavailable {
 err: "Error deriving keys or signing initial commitment transactions - either our RNG or our counterparty's RNG is broken or the Signer refused to sign".to_owned()
 err: "Signer refused to sign the initial commitment transaction".to_owned()
 }) },
 }
 };
Expand DownExpand Up@@ -6270,13 +6270,13 @@ where
 let _ = handle_error!(self, self.internal_channel_reestablish(counterparty_node_id, msg), *counterparty_node_id);
	}

	fn peer_disconnected(&self, counterparty_node_id: &PublicKey, no_connection_possible: bool) {
	fn peer_disconnected(&self, counterparty_node_id: &PublicKey) {
 let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
 let mut failed_channels = Vec::new();
 let mut per_peer_state = self.per_peer_state.write().unwrap();
 let remove_peer = {
 log_debug!(self.logger, "Marking channels with {} disconnected and generating channel_updates. We believe we {} make future connections to this peer.",
 log_pubkey!(counterparty_node_id), if no_connection_possible { "cannot" } else { "can" });
 log_debug!(self.logger, "Marking channels with {} disconnected and generating channel_updates.",
 log_pubkey!(counterparty_node_id));
 if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
Expand DownExpand Up@@ -6318,7 +6318,7 @@ where
 debug_assert!(peer_state.is_connected, "A disconnected peer cannot disconnect");
 peer_state.is_connected = false;
 peer_state.ok_to_remove(true)
 } else { true }
 } else { debug_assert!(false, "Unconnected peer disconnected"); true }
 };
 if remove_peer {
 per_peer_state.remove(counterparty_node_id);
Expand All@@ -6332,7 +6332,7 @@ where

	fn peer_connected(&self, counterparty_node_id: &PublicKey, init_msg: &msgs::Init) -> Result<(), ()> {
 if !init_msg.features.supports_static_remote_key() {
 log_debug!(self.logger, "Peer {} does not support static remote key, disconnecting with no_connection_possible", log_pubkey!(counterparty_node_id));
 log_debug!(self.logger, "Peer {} does not support static remote key, disconnecting", log_pubkey!(counterparty_node_id));
 return Err(());
 }

Expand DownExpand Up@@ -8210,8 +8210,8 @@ mod tests {

 let chan = create_announced_chan_between_nodes(&nodes, 0, 1);

 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 nodes[0].node.force_close_broadcasting_latest_txn(&chan.2, &nodes[1].node.get_our_node_id()).unwrap();
 check_closed_broadcast!(nodes[0], true);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix (and DRY) the conditionals before calling peer_disconnected#2035

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

TheBlueMatt
merged 6 commits into

from

Feb 21, 2023
 Merged


Fix (and DRY) the conditionals before calling peer_disconnected
#2035
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
3554678

Fix (and DRY) the conditionals before calling `peer_disconnected`


TheBlueMatt Feb 15, 2023
73e2fdf

Add test of an initial message other than `Init`


TheBlueMatt Feb 15, 2023
ca1b8bd

Correct the "is peer live" checks in `PeerManager`


TheBlueMatt Feb 15, 2023
10e0633

Correct `funding_transaction_generated` err msg and fix fuzz check


TheBlueMatt Feb 15, 2023
0f07d5c

Add a further debug_assert that disconnecting peers are connected


TheBlueMatt Feb 15, 2023
be6f263

Remove the `peer_disconnected` `no_connection_possible` flag


TheBlueMatt Feb 21, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 8 additions & 8 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -978,16 +978,16 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {

 0x0c => {
 if !chan_a_disconnected {
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id());
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id());
 chan_a_disconnected = true;
 drain_msg_events_on_disconnect!(0);
 }
 },
 0x0d => {
 if !chan_b_disconnected {
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id());
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id());
 chan_b_disconnected = true;
 drain_msg_events_on_disconnect!(2);
 }
Expand DownExpand Up@@ -1039,7 +1039,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {

 0x2c => {
 if !chan_a_disconnected {
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id());
 chan_a_disconnected = true;
 drain_msg_events_on_disconnect!(0);
 }
Expand All@@ -1053,14 +1053,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 },
 0x2d => {
 if !chan_a_disconnected {
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id());
 chan_a_disconnected = true;
 nodes[0].get_and_clear_pending_msg_events();
 ab_events.clear();
 ba_events.clear();
 }
 if !chan_b_disconnected {
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id());
 chan_b_disconnected = true;
 nodes[2].get_and_clear_pending_msg_events();
 bc_events.clear();
Expand All@@ -1072,7 +1072,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 },
 0x2e => {
 if !chan_b_disconnected {
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id());
 chan_b_disconnected = true;
 drain_msg_events_on_disconnect!(2);
 }
Expand Down

6 changes: 1 addition & 5 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,11 +634,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 if let Err(e) = channelmanager.funding_transaction_generated(&funding_generation.0, &funding_generation.1, tx.clone()) {
 // It's possible the channel has been closed in the mean time, but any other
 // failure may be a bug.
 if let APIError::ChannelUnavailable { err } = e {
 if !err.starts_with("Can't find a peer matching the passed counterparty node_id ") {
 assert_eq!(err, "No such channel");
 }
 } else { panic!(); }
 if let APIError::ChannelUnavailable { .. } = e { } else { panic!(); }
 }
 pending_funding_signatures.insert(funding_output, tx);
 }
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -842,13 +842,13 @@ mod test {

 // With only one sufficient-value peer connected we should only get its hint
 scid_aliases.remove(&chan_b.0.short_channel_id_alias.unwrap());
 nodes[0].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[2].node.get_our_node_id());
 match_invoice_routes(Some(1_000_000_000), &nodes[0], scid_aliases.clone());

 // If we don't have any sufficient-value peers connected we should get all hints with
 // sufficient value, even though there is a connected insufficient-value peer.
 scid_aliases.insert(chan_b.0.short_channel_id_alias.unwrap());
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 match_invoice_routes(Some(1_000_000_000), &nodes[0], scid_aliases);
	}

Expand Down

2 changes: 1 addition & 1 deletion
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -643,7 +643,7 @@ mod tests {
 fn handle_update_fee(&self, _their_node_id: &PublicKey, _msg: &UpdateFee) {}
 fn handle_announcement_signatures(&self, _their_node_id: &PublicKey, _msg: &AnnouncementSignatures) {}
 fn handle_channel_update(&self, _their_node_id: &PublicKey, _msg: &ChannelUpdate) {}
 fn peer_disconnected(&self, their_node_id: &PublicKey, _no_connection_possible: bool) {
 fn peer_disconnected(&self, their_node_id: &PublicKey) {
 if *their_node_id == self.expected_pubkey {
 self.disconnected_flag.store(true, Ordering::SeqCst);
 self.pubkey_disconnected.clone().try_send(()).unwrap();
Expand Down

52 changes: 26 additions & 26 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,8 +181,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	assert_eq!(nodes[0].node.list_channels().len(), 1);

	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 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));
	}

Expand DownExpand Up@@ -234,8 +234,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	assert_eq!(nodes[0].node.list_channels().len(), 1);

	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 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));
	}

Expand DownExpand Up@@ -337,8 +337,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	};

	if disconnect_count & !disconnect_flags > 0 {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	}

	// Now fix monitor updating...
Expand All@@ -348,8 +348,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	check_added_monitors!(nodes[0], 0);

	macro_rules! disconnect_reconnect_peers { () => { {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
 let reestablish_1 = get_chan_reestablish_msgs!(nodes[0], nodes[1]);
Expand DownExpand Up@@ -1110,8 +1110,8 @@ fn test_monitor_update_fail_reestablish() {

	let (payment_preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);

	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	nodes[2].node.claim_funds(payment_preimage);
	check_added_monitors!(nodes[2], 1);
Expand DownExpand Up@@ -1146,8 +1146,8 @@ fn test_monitor_update_fail_reestablish() {
	nodes[1].node.get_and_clear_pending_msg_events(); // Free the holding cell
	check_added_monitors!(nodes[1], 1);

	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -1315,8 +1315,8 @@ fn claim_while_disconnected_monitor_update_fail() {
	// Forward a payment for B to claim
	let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[1].node.claim_funds(payment_preimage_1);
	check_added_monitors!(nodes[1], 1);
Expand DownExpand Up@@ -1451,8 +1451,8 @@ fn monitor_failed_no_reestablish_response() {

	// Now disconnect and immediately reconnect, delivering the channel_reestablish while nodes[1]
	// is still failing to update monitors.
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -1873,8 +1873,8 @@ 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(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	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));
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
Expand DownExpand Up@@ -2041,8 +2041,8 @@ fn test_pending_update_fee_ack_on_reconnect() {
	let bs_first_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
	// bs_first_raa is not delivered until it is re-generated after reconnect

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
Expand DownExpand Up@@ -2169,8 +2169,8 @@ fn do_update_fee_resend_test(deliver_update: bool, parallel_updates: bool) {
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	}

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
Expand DownExpand Up@@ -2303,9 +2303,9 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
 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);
 } else {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 }
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 // Now reconnect the two
 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -2493,8 +2493,8 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
	}

	nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
	nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
	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));
Expand Down

16 changes: 8 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2691,7 +2691,7 @@ where
 (chan, funding_msg)
 },
 Err(_) => { return Err(APIError::ChannelUnavailable {
 err: "Error deriving keys or signing initial commitment transactions - either our RNG or our counterparty's RNG is broken or the Signer refused to sign".to_owned()
 err: "Signer refused to sign the initial commitment transaction".to_owned()
 }) },
 }
 };
Expand DownExpand Up@@ -6270,13 +6270,13 @@ where
 let _ = handle_error!(self, self.internal_channel_reestablish(counterparty_node_id, msg), *counterparty_node_id);
	}

	fn peer_disconnected(&self, counterparty_node_id: &PublicKey, no_connection_possible: bool) {
	fn peer_disconnected(&self, counterparty_node_id: &PublicKey) {
 let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
 let mut failed_channels = Vec::new();
 let mut per_peer_state = self.per_peer_state.write().unwrap();
 let remove_peer = {
 log_debug!(self.logger, "Marking channels with {} disconnected and generating channel_updates. We believe we {} make future connections to this peer.",
 log_pubkey!(counterparty_node_id), if no_connection_possible { "cannot" } else { "can" });
 log_debug!(self.logger, "Marking channels with {} disconnected and generating channel_updates.",
 log_pubkey!(counterparty_node_id));
 if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
Expand DownExpand Up@@ -6318,7 +6318,7 @@ where
 debug_assert!(peer_state.is_connected, "A disconnected peer cannot disconnect");
 peer_state.is_connected = false;
 peer_state.ok_to_remove(true)
 } else { true }
 } else { debug_assert!(false, "Unconnected peer disconnected"); true }
 };
 if remove_peer {
 per_peer_state.remove(counterparty_node_id);
Expand All@@ -6332,7 +6332,7 @@ where

	fn peer_connected(&self, counterparty_node_id: &PublicKey, init_msg: &msgs::Init) -> Result<(), ()> {
 if !init_msg.features.supports_static_remote_key() {
 log_debug!(self.logger, "Peer {} does not support static remote key, disconnecting with no_connection_possible", log_pubkey!(counterparty_node_id));
 log_debug!(self.logger, "Peer {} does not support static remote key, disconnecting", log_pubkey!(counterparty_node_id));
 return Err(());
 }

Expand DownExpand Up@@ -8210,8 +8210,8 @@ mod tests {

 let chan = create_announced_chan_between_nodes(&nodes, 0, 1);

 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 nodes[0].node.force_close_broadcasting_latest_txn(&chan.2, &nodes[1].node.get_our_node_id()).unwrap();
 check_closed_broadcast!(nodes[0], true);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix (and DRY) the conditionals before calling peer_disconnected#2035

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

TheBlueMatt
merged 6 commits into

from

Feb 21, 2023
 Merged


Fix (and DRY) the conditionals before calling peer_disconnected
#2035
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
3554678

Fix (and DRY) the conditionals before calling `peer_disconnected`


TheBlueMatt Feb 15, 2023
73e2fdf

Add test of an initial message other than `Init`


TheBlueMatt Feb 15, 2023
ca1b8bd

Correct the "is peer live" checks in `PeerManager`


TheBlueMatt Feb 15, 2023
10e0633

Correct `funding_transaction_generated` err msg and fix fuzz check


TheBlueMatt Feb 15, 2023
0f07d5c

Add a further debug_assert that disconnecting peers are connected


TheBlueMatt Feb 15, 2023
be6f263

Remove the `peer_disconnected` `no_connection_possible` flag


TheBlueMatt Feb 21, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 8 additions & 8 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -978,16 +978,16 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {

 0x0c => {
 if !chan_a_disconnected {
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id());
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id());
 chan_a_disconnected = true;
 drain_msg_events_on_disconnect!(0);
 }
 },
 0x0d => {
 if !chan_b_disconnected {
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id());
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id());
 chan_b_disconnected = true;
 drain_msg_events_on_disconnect!(2);
 }
Expand DownExpand Up@@ -1039,7 +1039,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {

 0x2c => {
 if !chan_a_disconnected {
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id());
 chan_a_disconnected = true;
 drain_msg_events_on_disconnect!(0);
 }
Expand All@@ -1053,14 +1053,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 },
 0x2d => {
 if !chan_a_disconnected {
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id());
 chan_a_disconnected = true;
 nodes[0].get_and_clear_pending_msg_events();
 ab_events.clear();
 ba_events.clear();
 }
 if !chan_b_disconnected {
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id());
 chan_b_disconnected = true;
 nodes[2].get_and_clear_pending_msg_events();
 bc_events.clear();
Expand All@@ -1072,7 +1072,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 },
 0x2e => {
 if !chan_b_disconnected {
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id());
 chan_b_disconnected = true;
 drain_msg_events_on_disconnect!(2);
 }
Expand Down

6 changes: 1 addition & 5 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,11 +634,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 if let Err(e) = channelmanager.funding_transaction_generated(&funding_generation.0, &funding_generation.1, tx.clone()) {
 // It's possible the channel has been closed in the mean time, but any other
 // failure may be a bug.
 if let APIError::ChannelUnavailable { err } = e {
 if !err.starts_with("Can't find a peer matching the passed counterparty node_id ") {
 assert_eq!(err, "No such channel");
 }
 } else { panic!(); }
 if let APIError::ChannelUnavailable { .. } = e { } else { panic!(); }
 }
 pending_funding_signatures.insert(funding_output, tx);
 }
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -842,13 +842,13 @@ mod test {

 // With only one sufficient-value peer connected we should only get its hint
 scid_aliases.remove(&chan_b.0.short_channel_id_alias.unwrap());
 nodes[0].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[2].node.get_our_node_id());
 match_invoice_routes(Some(1_000_000_000), &nodes[0], scid_aliases.clone());

 // If we don't have any sufficient-value peers connected we should get all hints with
 // sufficient value, even though there is a connected insufficient-value peer.
 scid_aliases.insert(chan_b.0.short_channel_id_alias.unwrap());
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 match_invoice_routes(Some(1_000_000_000), &nodes[0], scid_aliases);
	}

Expand Down

2 changes: 1 addition & 1 deletion
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -643,7 +643,7 @@ mod tests {
 fn handle_update_fee(&self, _their_node_id: &PublicKey, _msg: &UpdateFee) {}
 fn handle_announcement_signatures(&self, _their_node_id: &PublicKey, _msg: &AnnouncementSignatures) {}
 fn handle_channel_update(&self, _their_node_id: &PublicKey, _msg: &ChannelUpdate) {}
 fn peer_disconnected(&self, their_node_id: &PublicKey, _no_connection_possible: bool) {
 fn peer_disconnected(&self, their_node_id: &PublicKey) {
 if *their_node_id == self.expected_pubkey {
 self.disconnected_flag.store(true, Ordering::SeqCst);
 self.pubkey_disconnected.clone().try_send(()).unwrap();
Expand Down

52 changes: 26 additions & 26 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,8 +181,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	assert_eq!(nodes[0].node.list_channels().len(), 1);

	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 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));
	}

Expand DownExpand Up@@ -234,8 +234,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	assert_eq!(nodes[0].node.list_channels().len(), 1);

	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 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));
	}

Expand DownExpand Up@@ -337,8 +337,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	};

	if disconnect_count & !disconnect_flags > 0 {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	}

	// Now fix monitor updating...
Expand All@@ -348,8 +348,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	check_added_monitors!(nodes[0], 0);

	macro_rules! disconnect_reconnect_peers { () => { {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
 let reestablish_1 = get_chan_reestablish_msgs!(nodes[0], nodes[1]);
Expand DownExpand Up@@ -1110,8 +1110,8 @@ fn test_monitor_update_fail_reestablish() {

	let (payment_preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);

	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	nodes[2].node.claim_funds(payment_preimage);
	check_added_monitors!(nodes[2], 1);
Expand DownExpand Up@@ -1146,8 +1146,8 @@ fn test_monitor_update_fail_reestablish() {
	nodes[1].node.get_and_clear_pending_msg_events(); // Free the holding cell
	check_added_monitors!(nodes[1], 1);

	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -1315,8 +1315,8 @@ fn claim_while_disconnected_monitor_update_fail() {
	// Forward a payment for B to claim
	let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[1].node.claim_funds(payment_preimage_1);
	check_added_monitors!(nodes[1], 1);
Expand DownExpand Up@@ -1451,8 +1451,8 @@ fn monitor_failed_no_reestablish_response() {

	// Now disconnect and immediately reconnect, delivering the channel_reestablish while nodes[1]
	// is still failing to update monitors.
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -1873,8 +1873,8 @@ 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(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	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));
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
Expand DownExpand Up@@ -2041,8 +2041,8 @@ fn test_pending_update_fee_ack_on_reconnect() {
	let bs_first_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
	// bs_first_raa is not delivered until it is re-generated after reconnect

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
Expand DownExpand Up@@ -2169,8 +2169,8 @@ fn do_update_fee_resend_test(deliver_update: bool, parallel_updates: bool) {
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	}

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
Expand DownExpand Up@@ -2303,9 +2303,9 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
 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);
 } else {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 }
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 // Now reconnect the two
 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -2493,8 +2493,8 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
	}

	nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
	nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
	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));
Expand Down

16 changes: 8 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2691,7 +2691,7 @@ where
 (chan, funding_msg)
 },
 Err(_) => { return Err(APIError::ChannelUnavailable {
 err: "Error deriving keys or signing initial commitment transactions - either our RNG or our counterparty's RNG is broken or the Signer refused to sign".to_owned()
 err: "Signer refused to sign the initial commitment transaction".to_owned()
 }) },
 }
 };
Expand DownExpand Up@@ -6270,13 +6270,13 @@ where
 let _ = handle_error!(self, self.internal_channel_reestablish(counterparty_node_id, msg), *counterparty_node_id);
	}

	fn peer_disconnected(&self, counterparty_node_id: &PublicKey, no_connection_possible: bool) {
	fn peer_disconnected(&self, counterparty_node_id: &PublicKey) {
 let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
 let mut failed_channels = Vec::new();
 let mut per_peer_state = self.per_peer_state.write().unwrap();
 let remove_peer = {
 log_debug!(self.logger, "Marking channels with {} disconnected and generating channel_updates. We believe we {} make future connections to this peer.",
 log_pubkey!(counterparty_node_id), if no_connection_possible { "cannot" } else { "can" });
 log_debug!(self.logger, "Marking channels with {} disconnected and generating channel_updates.",
 log_pubkey!(counterparty_node_id));
 if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
Expand DownExpand Up@@ -6318,7 +6318,7 @@ where
 debug_assert!(peer_state.is_connected, "A disconnected peer cannot disconnect");
 peer_state.is_connected = false;
 peer_state.ok_to_remove(true)
 } else { true }
 } else { debug_assert!(false, "Unconnected peer disconnected"); true }
 };
 if remove_peer {
 per_peer_state.remove(counterparty_node_id);
Expand All@@ -6332,7 +6332,7 @@ where

	fn peer_connected(&self, counterparty_node_id: &PublicKey, init_msg: &msgs::Init) -> Result<(), ()> {
 if !init_msg.features.supports_static_remote_key() {
 log_debug!(self.logger, "Peer {} does not support static remote key, disconnecting with no_connection_possible", log_pubkey!(counterparty_node_id));
 log_debug!(self.logger, "Peer {} does not support static remote key, disconnecting", log_pubkey!(counterparty_node_id));
 return Err(());
 }

Expand DownExpand Up@@ -8210,8 +8210,8 @@ mod tests {

 let chan = create_announced_chan_between_nodes(&nodes, 0, 1);

 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 nodes[0].node.force_close_broadcasting_latest_txn(&chan.2, &nodes[1].node.get_our_node_id()).unwrap();
 check_closed_broadcast!(nodes[0], true);
Expand Down
Loading

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

Skip to content
Fix (and DRY) the conditionals before calling peer_disconnected#2035

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

TheBlueMatt
merged 6 commits into

from

Feb 21, 2023
 Merged


Fix (and DRY) the conditionals before calling peer_disconnected
#2035
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
3554678

Fix (and DRY) the conditionals before calling `peer_disconnected`


TheBlueMatt Feb 15, 2023
73e2fdf

Add test of an initial message other than `Init`


TheBlueMatt Feb 15, 2023
ca1b8bd

Correct the "is peer live" checks in `PeerManager`


TheBlueMatt Feb 15, 2023
10e0633

Correct `funding_transaction_generated` err msg and fix fuzz check


TheBlueMatt Feb 15, 2023
0f07d5c

Add a further debug_assert that disconnecting peers are connected


TheBlueMatt Feb 15, 2023
be6f263

Remove the `peer_disconnected` `no_connection_possible` flag


TheBlueMatt Feb 21, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 8 additions & 8 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -978,16 +978,16 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {

 0x0c => {
 if !chan_a_disconnected {
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id());
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id());
 chan_a_disconnected = true;
 drain_msg_events_on_disconnect!(0);
 }
 },
 0x0d => {
 if !chan_b_disconnected {
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id());
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id());
 chan_b_disconnected = true;
 drain_msg_events_on_disconnect!(2);
 }
Expand DownExpand Up@@ -1039,7 +1039,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {

 0x2c => {
 if !chan_a_disconnected {
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[0].get_our_node_id());
 chan_a_disconnected = true;
 drain_msg_events_on_disconnect!(0);
 }
Expand All@@ -1053,14 +1053,14 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 },
 0x2d => {
 if !chan_a_disconnected {
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[0].peer_disconnected(&nodes[1].get_our_node_id());
 chan_a_disconnected = true;
 nodes[0].get_and_clear_pending_msg_events();
 ab_events.clear();
 ba_events.clear();
 }
 if !chan_b_disconnected {
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
 nodes[2].peer_disconnected(&nodes[1].get_our_node_id());
 chan_b_disconnected = true;
 nodes[2].get_and_clear_pending_msg_events();
 bc_events.clear();
Expand All@@ -1072,7 +1072,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 },
 0x2e => {
 if !chan_b_disconnected {
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
 nodes[1].peer_disconnected(&nodes[2].get_our_node_id());
 chan_b_disconnected = true;
 drain_msg_events_on_disconnect!(2);
 }
Expand Down

6 changes: 1 addition & 5 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,11 +634,7 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 if let Err(e) = channelmanager.funding_transaction_generated(&funding_generation.0, &funding_generation.1, tx.clone()) {
 // It's possible the channel has been closed in the mean time, but any other
 // failure may be a bug.
 if let APIError::ChannelUnavailable { err } = e {
 if !err.starts_with("Can't find a peer matching the passed counterparty node_id ") {
 assert_eq!(err, "No such channel");
 }
 } else { panic!(); }
 if let APIError::ChannelUnavailable { .. } = e { } else { panic!(); }
 }
 pending_funding_signatures.insert(funding_output, tx);
 }
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -842,13 +842,13 @@ mod test {

 // With only one sufficient-value peer connected we should only get its hint
 scid_aliases.remove(&chan_b.0.short_channel_id_alias.unwrap());
 nodes[0].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[2].node.get_our_node_id());
 match_invoice_routes(Some(1_000_000_000), &nodes[0], scid_aliases.clone());

 // If we don't have any sufficient-value peers connected we should get all hints with
 // sufficient value, even though there is a connected insufficient-value peer.
 scid_aliases.insert(chan_b.0.short_channel_id_alias.unwrap());
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 match_invoice_routes(Some(1_000_000_000), &nodes[0], scid_aliases);
	}

Expand Down

2 changes: 1 addition & 1 deletion
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -643,7 +643,7 @@ mod tests {
 fn handle_update_fee(&self, _their_node_id: &PublicKey, _msg: &UpdateFee) {}
 fn handle_announcement_signatures(&self, _their_node_id: &PublicKey, _msg: &AnnouncementSignatures) {}
 fn handle_channel_update(&self, _their_node_id: &PublicKey, _msg: &ChannelUpdate) {}
 fn peer_disconnected(&self, their_node_id: &PublicKey, _no_connection_possible: bool) {
 fn peer_disconnected(&self, their_node_id: &PublicKey) {
 if *their_node_id == self.expected_pubkey {
 self.disconnected_flag.store(true, Ordering::SeqCst);
 self.pubkey_disconnected.clone().try_send(()).unwrap();
Expand Down

52 changes: 26 additions & 26 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,8 +181,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	assert_eq!(nodes[0].node.list_channels().len(), 1);

	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 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));
	}

Expand DownExpand Up@@ -234,8 +234,8 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
	assert_eq!(nodes[0].node.list_channels().len(), 1);

	if disconnect {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 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));
	}

Expand DownExpand Up@@ -337,8 +337,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	};

	if disconnect_count & !disconnect_flags > 0 {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	}

	// Now fix monitor updating...
Expand All@@ -348,8 +348,8 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
	check_added_monitors!(nodes[0], 0);

	macro_rules! disconnect_reconnect_peers { () => { {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
 let reestablish_1 = get_chan_reestablish_msgs!(nodes[0], nodes[1]);
Expand DownExpand Up@@ -1110,8 +1110,8 @@ fn test_monitor_update_fail_reestablish() {

	let (payment_preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);

	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	nodes[2].node.claim_funds(payment_preimage);
	check_added_monitors!(nodes[2], 1);
Expand DownExpand Up@@ -1146,8 +1146,8 @@ fn test_monitor_update_fail_reestablish() {
	nodes[1].node.get_and_clear_pending_msg_events(); // Free the holding cell
	check_added_monitors!(nodes[1], 1);

	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -1315,8 +1315,8 @@ fn claim_while_disconnected_monitor_update_fail() {
	// Forward a payment for B to claim
	let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[1].node.claim_funds(payment_preimage_1);
	check_added_monitors!(nodes[1], 1);
Expand DownExpand Up@@ -1451,8 +1451,8 @@ fn monitor_failed_no_reestablish_response() {

	// Now disconnect and immediately reconnect, delivering the channel_reestablish while nodes[1]
	// is still failing to update monitors.
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -1873,8 +1873,8 @@ 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(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	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));
	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
Expand DownExpand Up@@ -2041,8 +2041,8 @@ fn test_pending_update_fee_ack_on_reconnect() {
	let bs_first_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
	// bs_first_raa is not delivered until it is re-generated after reconnect

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
Expand DownExpand Up@@ -2169,8 +2169,8 @@ fn do_update_fee_resend_test(deliver_update: bool, parallel_updates: bool) {
 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
	}

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
Expand DownExpand Up@@ -2303,9 +2303,9 @@ fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
 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);
 } else {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 }
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 // Now reconnect the two
 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
Expand DownExpand Up@@ -2493,8 +2493,8 @@ fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_f
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
	}

	nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id(), false);
	nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
	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));
Expand Down

16 changes: 8 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2691,7 +2691,7 @@ where
 (chan, funding_msg)
 },
 Err(_) => { return Err(APIError::ChannelUnavailable {
 err: "Error deriving keys or signing initial commitment transactions - either our RNG or our counterparty's RNG is broken or the Signer refused to sign".to_owned()
 err: "Signer refused to sign the initial commitment transaction".to_owned()
 }) },
 }
 };
Expand DownExpand Up@@ -6270,13 +6270,13 @@ where
 let _ = handle_error!(self, self.internal_channel_reestablish(counterparty_node_id, msg), *counterparty_node_id);
	}

	fn peer_disconnected(&self, counterparty_node_id: &PublicKey, no_connection_possible: bool) {
	fn peer_disconnected(&self, counterparty_node_id: &PublicKey) {
 let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
 let mut failed_channels = Vec::new();
 let mut per_peer_state = self.per_peer_state.write().unwrap();
 let remove_peer = {
 log_debug!(self.logger, "Marking channels with {} disconnected and generating channel_updates. We believe we {} make future connections to this peer.",
 log_pubkey!(counterparty_node_id), if no_connection_possible { "cannot" } else { "can" });
 log_debug!(self.logger, "Marking channels with {} disconnected and generating channel_updates.",
 log_pubkey!(counterparty_node_id));
 if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
Expand DownExpand Up@@ -6318,7 +6318,7 @@ where
 debug_assert!(peer_state.is_connected, "A disconnected peer cannot disconnect");
 peer_state.is_connected = false;
 peer_state.ok_to_remove(true)
 } else { true }
 } else { debug_assert!(false, "Unconnected peer disconnected"); true }
 };
 if remove_peer {
 per_peer_state.remove(counterparty_node_id);
Expand All@@ -6332,7 +6332,7 @@ where

	fn peer_connected(&self, counterparty_node_id: &PublicKey, init_msg: &msgs::Init) -> Result<(), ()> {
 if !init_msg.features.supports_static_remote_key() {
 log_debug!(self.logger, "Peer {} does not support static remote key, disconnecting with no_connection_possible", log_pubkey!(counterparty_node_id));
 log_debug!(self.logger, "Peer {} does not support static remote key, disconnecting", log_pubkey!(counterparty_node_id));
 return Err(());
 }

Expand DownExpand Up@@ -8210,8 +8210,8 @@ mod tests {

 let chan = create_announced_chan_between_nodes(&nodes, 0, 1);

 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());

 nodes[0].node.force_close_broadcasting_latest_txn(&chan.2, &nodes[1].node.get_our_node_id()).unwrap();
 check_closed_broadcast!(nodes[0], true);
Expand Down
Loading