Fixed errors with several constraints checking for new peers

ethereum · Jan 12, 2017 · 3f01b5e · 3f01b5e
1 parent 72f85b6
commit 3f01b5e
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/ethereumj-core/src/main/java/org/ethereum/net/eth/handler/Eth62.java b/ethereumj-core/src/main/java/org/ethereum/net/eth/handler/Eth62.java
@@ -534,18 +534,16 @@ protected synchronized void processInitHeaders(List<BlockHeader> received) {
             for (Pair<Long, byte[]> constraint : constraints) {
                 if (constraint.getLeft() <= getBestKnownBlock().getNumber()) {
                     blockHashCheck.put(constraint.getLeft(), constraint.getRight());
-                    sendGetBlockHeaders(constraint.getLeft(), 1, false);
                 }
             }
-
-            logger.trace("Peer " + channel.getPeerIdShort() + ": Requested " + blockHashCheck.size() +
-                    " headers for hash check: " + blockHashCheck.keySet());
+            requestNextHashCheck();
 
         } else {
             byte[] expectedHash = blockHashCheck.get(first.getNumber());
             if (expectedHash != null) {
                 if (FastByteComparisons.equal(expectedHash, first.getHash())) {
                     blockHashCheck.remove(first.getNumber());
+                    requestNextHashCheck();
                 } else {
                     logger.debug("Peer " + channel.getPeerIdShort() + ": wrong fork (expected block " +
                             first.getNumber() + " hash " + Hex.toHexString(expectedHash) + ", but got " +
@@ -563,6 +561,14 @@ protected synchronized void processInitHeaders(List<BlockHeader> received) {
         }
     }
 
+    private void requestNextHashCheck() {
+        if (!blockHashCheck.isEmpty()) {
+            Long checkHeader = blockHashCheck.keySet().iterator().next();
+            sendGetBlockHeaders(checkHeader, 1, false);
+            logger.trace("Peer {}: Requested #{} header for hash check.", channel.getPeerIdShort(), checkHeader);
+        }
+    }
+
     private void updateBestBlock(Block block) {
         updateBestBlock(block.getHeader());
     }