Do not connect to already connected peer from peers_exchange

* Ignore qrc20_tests::test_search_for_swap_tx_spend
KomodoPlatform · Dec 3, 2020 · 3de21d9 · 3de21d9
1 parent 6dad1bb
commit 3de21d9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/mm2src/coins/qrc20/qrc20_tests.rs b/mm2src/coins/qrc20/qrc20_tests.rs
@@ -639,6 +639,7 @@ fn test_validate_fee() {
 }
 
 #[test]
+#[ignore]
 fn test_search_for_swap_tx_spend() {
     // priv_key of qXxsj5RtciAby9T7m98AgAATL4zTi4UwDG
     let priv_key = [

diff --git a/mm2src/mm2_libp2p/src/atomicdex_behaviour.rs b/mm2src/mm2_libp2p/src/atomicdex_behaviour.rs
@@ -1,5 +1,5 @@
 use crate::{adex_ping::AdexPing,
-            peers_exchange::PeersExchange,
+            peers_exchange::{PeerAddresses, PeersExchange},
             request_response::{build_request_response_behaviour, PeerRequest, PeerResponse, RequestResponseBehaviour,
                                RequestResponseBehaviourEvent, RequestResponseSender}};
 use atomicdex_gossipsub::{Gossipsub, GossipsubConfigBuilder, GossipsubEvent, GossipsubMessage, MessageId, Topic,
@@ -381,8 +381,8 @@ impl AtomicDexBehaviour {
         }
     }
 
-    fn announce_listeners(&mut self, listeners: Vec<Multiaddr>) {
-        let serialized = rmp_serde::to_vec(&listeners).expect("Vec<Multiaddr> serialization should never fail");
+    fn announce_listeners(&mut self, listeners: PeerAddresses) {
+        let serialized = rmp_serde::to_vec(&listeners).expect("PeerAddresses serialization should never fail");
         self.floodsub.publish(FloodsubTopic::new(PEERS_TOPIC), serialized);
     }
 
@@ -400,7 +400,7 @@ impl NetworkBehaviourEventProcess<FloodsubEvent> for AtomicDexBehaviour {
         if let FloodsubEvent::Message(message) = &event {
             for topic in &message.topics {
                 if topic == &FloodsubTopic::new(PEERS_TOPIC) {
-                    let addresses: Vec<Multiaddr> = match rmp_serde::from_read_ref(&message.data) {
+                    let addresses: PeerAddresses = match rmp_serde::from_read_ref(&message.data) {
                         Ok(a) => a,
                         Err(_) => return,
                     };
@@ -476,6 +476,9 @@ fn maintain_connection_to_relays(swarm: &mut AtomicDexSwarm, bootstrap_addresses
         }
         for (peer, addresses) in to_connect {
             for addr in addresses {
+                if swarm.gossipsub.is_connected_to_addr(&addr) {
+                    continue;
+                }
                 if let Err(e) = libp2p::Swarm::dial_addr(swarm, addr.clone()) {
                     error!("Peer {} address {} dial error {}", peer, addr, e);
                 }
@@ -507,7 +510,7 @@ fn maintain_connection_to_relays(swarm: &mut AtomicDexSwarm, bootstrap_addresses
 }
 
 fn announce_my_addresses(swarm: &mut AtomicDexSwarm) {
-    let global_listeners: Vec<_> = Swarm::listeners(&swarm)
+    let global_listeners: PeerAddresses = Swarm::listeners(&swarm)
         .filter(|listener| {
             for protocol in listener.iter() {
                 if let Protocol::Ip4(ip) = protocol {

diff --git a/mm2src/mm2_libp2p/src/peers_exchange.rs b/mm2src/mm2_libp2p/src/peers_exchange.rs
@@ -9,12 +9,15 @@ use libp2p::{multiaddr::Multiaddr,
 use log::{error, info};
 use rand::{seq::SliceRandom, thread_rng};
 use serde::{de::Deserializer, ser::Serializer, Deserialize, Serialize};
+use std::collections::HashSet;
 use std::{collections::{HashMap, VecDeque},
           iter,
           task::{Context, Poll},
           time::Duration};
 use wasm_timer::{Instant, Interval};
 
+pub type PeerAddresses = HashSet<Multiaddr>;
+
 #[derive(Debug, Clone)]
 pub enum PeersExchangeProtocol {
     Version1,
@@ -62,9 +65,7 @@ pub enum PeersExchangeRequest {
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub enum PeersExchangeResponse {
-    KnownPeers {
-        peers: HashMap<PeerIdSerde, Vec<Multiaddr>>,
-    },
+    KnownPeers { peers: HashMap<PeerIdSerde, PeerAddresses> },
 }
 
 /// Behaviour that requests known peers list from other peers at random
@@ -98,12 +99,12 @@ impl PeersExchange {
         }
     }
 
-    fn get_random_known_peers(&mut self, num: usize) -> HashMap<PeerIdSerde, Vec<Multiaddr>> {
+    fn get_random_known_peers(&mut self, num: usize) -> HashMap<PeerIdSerde, PeerAddresses> {
         let mut result = HashMap::with_capacity(num);
         let mut rng = thread_rng();
         let peer_ids = self.known_peers.choose_multiple(&mut rng, num).cloned();
         for peer_id in peer_ids {
-            let addresses = self.request_response.addresses_of_peer(&peer_id);
+            let addresses = self.request_response.addresses_of_peer(&peer_id).into_iter().collect();
             result.insert(peer_id.into(), addresses);
         }
         result
@@ -121,7 +122,7 @@ impl PeersExchange {
         }
     }
 
-    pub fn add_peer_addresses(&mut self, peer: &PeerId, addresses: Vec<Multiaddr>) {
+    pub fn add_peer_addresses(&mut self, peer: &PeerId, addresses: PeerAddresses) {
         if !self.known_peers.contains(&peer) && !addresses.is_empty() {
             self.known_peers.push(peer.clone());
         }
@@ -160,12 +161,12 @@ impl PeersExchange {
         &mut self,
         num: usize,
         mut filter: impl FnMut(&PeerId) -> bool,
-    ) -> HashMap<PeerId, Vec<Multiaddr>> {
+    ) -> HashMap<PeerId, PeerAddresses> {
         let mut result = HashMap::with_capacity(num);
         let mut rng = thread_rng();
         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);
+            let addresses = self.request_response.addresses_of_peer(*peer_id).into_iter().collect();
             result.insert((*peer_id).clone(), addresses);
         }
         result