f clean up and fix checks a bit

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -4280,7 +4280,7 @@ where
 				unfunded_channels += 1;
 			}
 		}
-		if unfunded_channels > MAX_UNFUNDED_CHANS_PER_PEER {
+		if unfunded_channels >= MAX_UNFUNDED_CHANS_PER_PEER {
 			return Err(MsgHandleErrInternal::send_err_msg_no_close(
 				format!("Refusing more than {} unfunded channels.", MAX_UNFUNDED_CHANS_PER_PEER),
 				msg.temporary_channel_id.clone()));
@@ -6239,15 +6239,18 @@ where
 			return Err(());
 		}
 
-		log_debug!(self.logger, "Generating channel_reestablish events for {}", log_pubkey!(counterparty_node_id));
-
 		let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
 
 		let mut peers_with_unfunded_channels = 0;
+		let mut peer_has_channels = false;
 		let best_block_height = self.best_block.read().unwrap().height();
 		{
 			let peer_state_lock = self.per_peer_state.read().unwrap();
-			for (_, peer) in peer_state_lock.iter() {
+			for (node_id, peer) in peer_state_lock.iter() {
+				if node_id == counterparty_node_id {
+					peer_has_channels = true;
+					break;
+				}
 				let mut has_funded_channels = false;
 				for (_, chan) in peer.lock().unwrap().channel_by_id.iter() {
 					if chan.get_funding_tx_confirmations(best_block_height) != 0 || chan.minimum_depth() == 0 {
@@ -6257,7 +6260,7 @@ where
 				if !has_funded_channels { peers_with_unfunded_channels += 1 }
 			}
 		}
-		if inbound && peers_with_unfunded_channels > MAX_NO_CHANNEL_PEERS {
+		if !peer_has_channels && inbound && peers_with_unfunded_channels >= MAX_NO_CHANNEL_PEERS {
 			return Err(());
 		}
 
@@ -6281,8 +6284,9 @@ where
 			}
 		}
 
-		let per_peer_state = self.per_peer_state.read().unwrap();
+		log_debug!(self.logger, "Generating channel_reestablish events for {}", log_pubkey!(counterparty_node_id));
 
+		let per_peer_state = self.per_peer_state.read().unwrap();
 		for (_cp_id, 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;