respond to comments

Author: arik-so

lightning/src/ln/peer_handler.rs

@@ -1075,7 +1075,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 			let peers = &mut peers.peers;
 
 			peers.retain(|descriptor, peer| {
-				if peer.awaiting_pong == true {
+				if peer.awaiting_pong {
 					peers_needing_send.remove(descriptor);
 					match peer.their_node_id {
 						Some(node_id) => {
@@ -1084,10 +1084,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 						},
 						None => {}
 					}
-				}
-
-				// The peer needs to complete its handshake before we can exchange messages
-				if !peer.channel_encryptor.is_ready_for_encryption() {
+				} else if !peer.channel_encryptor.is_ready_for_encryption() {
+					// The peer needs to complete its handshake before we can exchange messages
 					return true;
 				}
 
@@ -1100,12 +1098,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 				let mut descriptor_clone = descriptor.clone();
 				self.do_attempt_write_data(&mut descriptor_clone, peer);
 
-				if peer.awaiting_pong {
-					false // Drop the peer
-				} else {
-					peer.awaiting_pong = true;
-					true
-				}
+				peer.awaiting_pong = !peer.awaiting_pong; // flip the condition
+				peer.awaiting_pong
 			});
 		}
 	}
@@ -1233,8 +1227,7 @@ mod tests {
 		assert_eq!(peers[0].peers.lock().unwrap().peers.len(), 1);
 
 		// Since timer_tick_occured() is called again when awaiting_pong is true, all Peers are disconnected
-		// TODO: simulate handshake completion to fully support ping exchange simulations
-		// peers[0].timer_tick_occured();
-		// assert_eq!(peers[0].peers.lock().unwrap().peers.len(), 0);
+		peers[0].timer_tick_occured();
+		assert_eq!(peers[0].peers.lock().unwrap().peers.len(), 0);
 	}
 }