Merge branch 'master' of github.com:ScorexFoundation/Scorex into merge

Author: dkaidalov

examples/src/main/resources/settings.conf

@@ -10,7 +10,7 @@ scorex {
   network {
     nodeName = "generatorNode1"
     bindAddress = "127.0.0.1:9084"
-    knownPeers = ["127.0.0.2:9088"]
+    knownPeers = []
     agentName = "2-Hop"
   }
 

src/main/resources/reference.conf

@@ -86,7 +86,7 @@ scorex {
     # upnp-discover-timeout = 3s
 
     # Network handshake timeout
-    handshakeTimeout = 2s
+    handshakeTimeout = 30s
 
     # Network delivery timeout
     deliveryTimeout = 2s

src/main/scala/scorex/core/network/PeerConnectionHandler.scala

@@ -134,6 +134,7 @@ class PeerConnectionHandler(val settings: NetworkSettings,
 
   private def handshakeTimeout: Receive = {
     case HandshakeTimeout =>
+      log.info(s"Handshake timeout with $remote, going to drop the connection")
       self ! CloseConnection
   }
 

src/main/scala/scorex/core/network/peer/PeerManager.scala

@@ -106,10 +106,13 @@ class PeerManager(settings: ScorexSettings, timeProvider: NetworkTimeProvider) e
         val isIncoming = direction == Incoming
         val isAlreadyConnecting = connectingPeers.contains(remote)
         if (isAlreadyConnecting && !isIncoming) {
-          log.info(s"Already connected peer $remote trying to connect, going to drop the duplicate connection")
+          log.info(s"Trying to connect twice to $remote, going to drop the duplicate connection")
           peerHandlerRef ! CloseConnection
         } else {
-          if (!isIncoming) log.info(s"Connecting to $remote")
+          if (!isIncoming) {
+            log.info(s"Connecting to $remote")
+            connectingPeers += remote
+          }
           peerHandlerRef ! StartInteraction
           lastIdUsed += 1
         }
@@ -148,7 +151,6 @@ class PeerManager(settings: ScorexSettings, timeProvider: NetworkTimeProvider) e
           //todo: avoid picking too many peers from the same bucket, see Bitcoin ref. impl.
           if (!connectedPeers.exists(_._1 == address) &&
             !connectingPeers.exists(_.getHostName == address.getHostName)) {
-            connectingPeers += address
             sender() ! ConnectTo(address)
           }
         }