feat(AutoDialer): do use peer with a pending connection

richardschneider · May 7, 2019 · 5dd2341 · 5dd2341
1 parent b1f1c36
commit 5dd2341
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 0 deletions.
diff --git a/src/AutoDialer.cs b/src/AutoDialer.cs
@@ -138,6 +138,7 @@ void OnPeerDisconnected(object sender, Peer disconnectedPeer)
             var peer = swarm.KnownPeers
                 .Where(p => p.ConnectedAddress == null)
                 .Where(p => p != disconnectedPeer)
+                .Where(p => !swarm.HasPendingConnection(p))
                 .FirstOrDefault();
             if (peer != null)
             {

diff --git a/src/Swarm.cs b/src/Swarm.cs
@@ -305,6 +305,20 @@ public Peer RegisterPeer(Peer peer)
             return p;
         }
 
+        /// <summary>
+        ///   Determines if a connection is being made to the peer.
+        /// </summary>
+        /// <param name="peer">
+        ///   A <see cref="Peer"/>.
+        /// </param>
+        /// <returns>
+        ///   <b>true</b> is the <paramref name="peer"/> has a pending connection.
+        /// </returns>
+        public bool HasPendingConnection(Peer peer)
+        {
+            return pendingConnections.TryGetValue(peer, out Task<PeerConnection> _);
+        }
+
         /// <summary>
         ///   The addresses that cannot be used.
         /// </summary>

diff --git a/test/SwarmTest.cs b/test/SwarmTest.cs
@@ -270,6 +270,33 @@ public async Task Connect_CancelsOnStop()
 
         }
 
+        [TestMethod]
+        public async Task Connect_IsPending()
+        {
+            var swarm = new Swarm { LocalPeer = self };
+            var venus = new Peer
+            {
+                Id = "QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ",
+                Addresses = new MultiAddress[]
+                {
+                    "/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ",            // mars.i.ipfs.io
+                }
+            };
+
+            await swarm.StartAsync();
+            try
+            {
+                Assert.IsFalse(swarm.HasPendingConnection(venus));
+
+                var a = swarm.ConnectAsync(venus);
+                Assert.IsTrue(swarm.HasPendingConnection(venus));
+            }
+            finally
+            {
+                await swarm.StopAsync();
+            }
+        }
+
         [TestMethod]
         public async Task Connect_WithSomeUnreachableAddresses()
         {