f Iterate less

Author: tnull

src/lib.rs

@@ -1837,24 +1837,25 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 
 		// First add all connected peers, preferring to list the connected address if available.
 		let connected_peers = self.peer_manager.get_peer_node_ids();
-		for (node_id, con_addr_opt) in connected_peers {
+		for (node_id, con_addr_opt) in &connected_peers {
 			let stored_peer = self.peer_store.get_peer(&node_id);
 			let stored_addr_opt = stored_peer.as_ref().map(|p| p.address.clone());
+
 			let address = match (con_addr_opt, stored_addr_opt) {
-				(Some(con_addr), _) => NetAddress(con_addr),
+				(Some(con_addr), _) => NetAddress(con_addr.clone()),
 				(None, Some(stored_addr)) => stored_addr,
 				(None, None) => continue,
 			};
 
 			let is_persisted = stored_peer.is_some();
 			let is_connected = true;
-			let details = PeerDetails { node_id, address, is_persisted, is_connected };
+			let details = PeerDetails { node_id: *node_id, address, is_persisted, is_connected };
 			peers.push(details);
 		}
 
 		// Now add all known-but-offline peers, too.
 		for p in self.peer_store.list_peers() {
-			if peers.iter().find(|d| d.node_id == p.node_id).is_some() {
+			if connected_peers.iter().find(|c| c.0 == p.node_id).is_some() {
 				continue;
 			}