f filter_map after all

Author: tnull

lightning/src/ln/peer_handler.rs

@@ -750,17 +750,15 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 	/// `new_outbound_connection`, however entries will only appear once the initial handshake has
 	/// completed and we are sure the remote peer has the private key for the given `node_id`.
 	pub fn get_peer_addresses(&self) -> HashMap<PublicKey, NetAddress> {
-		let mut peer_addrs = HashMap::new();
-
 		let peers = self.peers.read().unwrap();
-		for peer_mutex in peers.values() {
+		peers.values().filter_map(|peer_mutex| {
 			let p = peer_mutex.lock().unwrap();
-			if p.channel_encryptor.is_ready_for_encryption() && p.their_features.is_some() &&
-				p.their_node_id.is_some() && p.their_net_address.is_some() {
-				peer_addrs.insert(p.their_node_id.unwrap(), p.their_net_address.clone().unwrap());
+			if !p.channel_encryptor.is_ready_for_encryption() || p.their_features.is_none() ||
+				p.their_node_id.is_none() || p.their_net_address.is_none() {
+				return None;
 			}
-		}
-		peer_addrs
+			Some((p.their_node_id.unwrap(), p.their_net_address.clone().unwrap()))
+		}).collect()
 	}
 
 	fn get_ephemeral_key(&self) -> SecretKey {