Fix reconnection to peers from peers_exchange

KomodoPlatform · Nov 27, 2020 · 392f559 · 392f559
1 parent 54d206f
commit 392f559
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/mm2src/mm2_libp2p/src/atomicdex_behaviour.rs b/mm2src/mm2_libp2p/src/atomicdex_behaviour.rs
@@ -470,13 +470,15 @@ fn maintain_connection_to_relays(swarm: &mut AtomicDexSwarm, bootstrap_addresses
                 .choose_multiple(&mut thread_rng(), connect_bootstrap_num)
             {
                 if let Err(e) = libp2p::Swarm::dial_addr(swarm, (*addr).clone()) {
-                    error!("Addr {} dial error {}", addr, e);
+                    error!("Bootstrap addr {} dial error {}", addr, e);
                 }
             }
         }
-        for peer in to_connect {
-            if let Err(e) = libp2p::Swarm::dial(swarm, &peer) {
-                error!("Peer {} dial error {}", peer, e);
+        for (peer, addresses) in to_connect {
+            for addr in addresses {
+                if let Err(e) = libp2p::Swarm::dial_addr(swarm, addr.clone()) {
+                    error!("Peer {} address {} dial error {}", peer, addr, e);
+                }
             }
         }
     }

diff --git a/mm2src/mm2_libp2p/src/peers_exchange.rs b/mm2src/mm2_libp2p/src/peers_exchange.rs
@@ -156,15 +156,19 @@ impl PeersExchange {
         }
     }
 
-    pub fn get_random_peers(&self, num: usize, mut filter: impl FnMut(&PeerId) -> bool) -> Vec<PeerId> {
+    pub fn get_random_peers(
+        &mut self,
+        num: usize,
+        mut filter: impl FnMut(&PeerId) -> bool,
+    ) -> HashMap<PeerId, Vec<Multiaddr>> {
+        let mut result = HashMap::with_capacity(num);
         let mut rng = thread_rng();
-        self.known_peers
-            .iter()
-            .filter(|peer| filter(*peer))
-            .collect::<Vec<_>>()
-            .choose_multiple(&mut rng, num)
-            .map(|peer| (*peer).clone())
-            .collect()
+        let peer_ids = self.known_peers.iter().filter(|peer| filter(*peer)).collect::<Vec<_>>();
+        for peer_id in peer_ids.choose_multiple(&mut rng, num) {
+            let addresses = self.request_response.addresses_of_peer(*peer_id);
+            result.insert((*peer_id).clone(), addresses);
+        }
+        result
     }
 
     pub fn is_known_peer(&self, peer: &PeerId) -> bool { self.known_peers.contains(peer) }