fixing PeerConnectionHandler (#396)

* fixing PeerConnectionHandler Signed-off-by: pragmaxim <pragmaxim@gmail.com> * adding handy SyncTracker.peersByStatus method Signed-off-by: pragmaxim <pragmaxim@gmail.com>
hyperledger-labs · May 21, 2021 · a6fe141 · a6fe141
1 parent 30f3bea
commit a6fe141
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/scala/scorex/core/network/SyncTracker.scala b/src/main/scala/scorex/core/network/SyncTracker.scala
@@ -92,6 +92,10 @@ class SyncTracker(nvsRef: ActorRef,
   private def outdatedPeers(): Seq[ConnectedPeer] =
     lastSyncSentTime.filter(t => (timeProvider.time() - t._2).millis > maxInterval()).keys.toSeq
 
+
+  def peersByStatus: Map[HistoryComparisonResult, Iterable[ConnectedPeer]] =
+    statuses.groupBy(_._2).mapValues(_.keys).view.force
+
   private def numOfSeniors(): Int = statuses.count(_._2 == Older)
 
   /**

diff --git a/src/main/scala/scorex/core/network/message/MessageSerializer.scala b/src/main/scala/scorex/core/network/message/MessageSerializer.scala
@@ -43,21 +43,19 @@ class MessageSerializer(specs: Seq[MessageSpec[_]], magicBytes: Array[Byte]) {
       val msgCode = it.getByte
       val length = it.getInt
 
-      //peer is from another network
-      if (!java.util.Arrays.equals(magic, magicBytes)) {
-        throw MaliciousBehaviorException(s"Wrong magic bytes, expected ${magicBytes.mkString}, got ${magic.mkString}")
-      }
-
       //peer is trying to cause buffer overflow or breaking the parsing
       if (length < 0) {
         throw MaliciousBehaviorException("Data length is negative!")
       }
 
-      val spec = specsMap.getOrElse(msgCode, throw new Error(s"No message handler found for $msgCode"))
-
       if (length != 0 && byteString.length < length + HeaderLength + ChecksumLength) {
         None
       } else {
+        //peer is from another network
+        if (!java.util.Arrays.equals(magic, magicBytes)) {
+          throw MaliciousBehaviorException(s"Wrong magic bytes, expected ${magicBytes.mkString}, got ${magic.mkString} in : ${byteString.utf8String}")
+        }
+        val spec = specsMap.getOrElse(msgCode, throw new Error(s"No message handler found for $msgCode"))
         val msgData = if (length > 0) {
           val checksum = it.getBytes(ChecksumLength)
           val data = it.getBytes(length)