From e5b3166df4e24543b9122daeb00584d45569a628 Mon Sep 17 00:00:00 2001 From: catbref Date: Fri, 10 May 2019 20:11:01 +0100 Subject: [PATCH] Improve synchronization --- src/main/java/org/qora/controller/Controller.java | 2 +- src/main/java/org/qora/controller/Synchronizer.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/qora/controller/Controller.java b/src/main/java/org/qora/controller/Controller.java index 80b2ed7b..6e0ea878 100644 --- a/src/main/java/org/qora/controller/Controller.java +++ b/src/main/java/org/qora/controller/Controller.java @@ -212,7 +212,7 @@ public class Controller extends Thread { try { while (!isStopping) { - Thread.sleep(1000); + Thread.sleep(10000); potentiallySynchronize(); diff --git a/src/main/java/org/qora/controller/Synchronizer.java b/src/main/java/org/qora/controller/Synchronizer.java index ec34fe03..33900f31 100644 --- a/src/main/java/org/qora/controller/Synchronizer.java +++ b/src/main/java/org/qora/controller/Synchronizer.java @@ -69,6 +69,10 @@ public class Synchronizer { this.ourHeight = this.repository.getBlockRepository().getBlockchainHeight(); final int peerHeight = peer.getPeerData().getLastHeight(); + // If peer is at genesis block then peer has no blocks so ignore them for a while + if (peerHeight == 1) + return false; + LOGGER.info(String.format("Synchronizing with peer %s at height %d, our height %d", peer, peerHeight, this.ourHeight)); List signatures = findSignaturesFromCommonBlock(peer); @@ -83,10 +87,6 @@ public class Synchronizer { LOGGER.info(String.format("Common block with peer %s is at height %d", peer, commonBlockHeight)); signatures.remove(0); - // If common block is genesis block then peer has no blocks so ignore them for a while - if (commonBlockHeight == 1) - return false; - // If common block is peer's latest block then we simply have a longer chain to peer, so exit now if (commonBlockHeight == peerHeight) return true;