f - update Don't serialize nodes which we have no channels to

Author: ViktorTigerstrom

lightning/src/ln/channelmanager.rs

@@ -493,6 +493,18 @@ pub(super) struct PeerState<Signer: ChannelSigner> {
 	is_connected: bool,
 }
 
+impl <Signer: ChannelSigner> PeerState<Signer> {
+	/// Indicates that a peer meets the criteria where we're ok to remove it from our storage.
+	/// If true is passed for `require_disconnected`, the function will return false if we haven't
+	/// disconnected from the node already, ie. `PeerState::is_connected` is set to `true`.
+	fn ok_to_remove(&self, require_disconnected: bool) -> bool {
+		if require_disconnected && self.is_connected {
+			return false
+		}
+		self.channel_by_id.len() == 0
+	}
+}
+
 /// Stores a PaymentSecret and any other data we may need to validate an inbound payment is
 /// actually ours and not some duplicate HTLC sent to us by a node along the route.
 ///
@@ -1749,12 +1761,6 @@ where
 			.collect()
 	}
 
-	// Indicates that a peer meets the criteria where we're ok to disconnect the peer and remove it
-	// from our storage
-	fn ok_to_disconnected(&self, peer: &PeerState<<SP::Target as SignerProvider>::Signer>) -> bool {
-		peer.channel_by_id.len() == 0
-	}
-
 	/// Helper function that issues the channel close events
 	fn issue_channel_close_events(&self, channel: &Channel<<SP::Target as SignerProvider>::Signer>, closure_reason: ClosureReason) {
 		let mut pending_events_lock = self.pending_events.lock().unwrap();
@@ -3547,8 +3553,7 @@ where
 
 						true
 					});
-					let peer_should_be_removed = !peer_state.is_connected && peer_state.channel_by_id.len() == 0;
-					if peer_should_be_removed {
+					if peer_state.ok_to_remove(true) {
 						pending_peers_awaiting_removal.push(counterparty_node_id);
 					}
 				}
@@ -3570,7 +3575,7 @@ where
 							// have no channels to the peer.
 							let remove_entry = {
 								let peer_state = entry.get().lock().unwrap();
-								!peer_state.is_connected && peer_state.channel_by_id.len() == 0
+								peer_state.ok_to_remove(true)
 							};
 							if remove_entry {
 								entry.remove_entry();
@@ -6328,9 +6333,8 @@ where
 	fn peer_disconnected(&self, counterparty_node_id: &PublicKey, no_connection_possible: bool) {
 		let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
 		let mut failed_channels = Vec::new();
-		let mut no_channels_remain = true;
 		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" });
 			if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
@@ -6343,8 +6347,6 @@ where
 						update_maps_on_chan_removal!(self, chan);
 						self.issue_channel_close_events(chan, ClosureReason::DisconnectedPeer);
 						return false;
-					} else {
-						no_channels_remain = false;
 					}
 					true
 				});
@@ -6374,9 +6376,10 @@ where
 				});
 				debug_assert!(peer_state.is_connected, "A disconnected peer cannot disconnect");
 				peer_state.is_connected = false;
-			}
-		}
-		if no_channels_remain {
+				peer_state.ok_to_remove(true)
+			} else { true }
+		};
+		if remove_peer {
 			per_peer_state.remove(counterparty_node_id);
 		}
 		mem::drop(per_peer_state);
@@ -6978,7 +6981,7 @@ where
 			for (_, peer_state_mutex) in per_peer_state.iter() {
 				let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 				let peer_state = &mut *peer_state_lock;
-				if !self.ok_to_disconnected(peer_state) {
+				if !peer_state.ok_to_remove(false) {
 					peers_to_searialize_count += 1;
 				}
 				number_of_channels += peer_state.channel_by_id.len();
@@ -7035,7 +7038,7 @@ where
 		for (peer_pubkey, peer_state_mutex) in per_peer_state.iter() {
 			let peer_state_lock= peer_state_mutex.lock().unwrap();
 			let peer_state = & *peer_state_lock;
-			if !self.ok_to_disconnected(peer_state) {
+			if !peer_state.ok_to_remove(false) {
 				peer_pubkey.write(writer)?;
 				peer_state.latest_features.write(writer)?;
 			}