From b85afe3ca7854b09a370e2a1c6b479cac2fd7431 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sun, 19 Jun 2022 19:10:30 +0100 Subject: [PATCH] Revert "Keep existing findCommonBlocksWithPeers() and comparePeers() behaviour prior to consensus switchover, to reduce the number of variables." This reverts commit fecfac5ad94b38c99dde3413750ed0c69ec45bff. --- src/main/java/org/qortal/controller/Synchronizer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/qortal/controller/Synchronizer.java b/src/main/java/org/qortal/controller/Synchronizer.java index 61903bc7..61b5a331 100644 --- a/src/main/java/org/qortal/controller/Synchronizer.java +++ b/src/main/java/org/qortal/controller/Synchronizer.java @@ -241,12 +241,12 @@ public class Synchronizer extends Thread { final int peersBeforeComparison = peers.size(); - if (!isNewConsensusActive) { + if (isNewConsensusActive) { // Request recent block summaries from the remaining peers, and locate our common block with each - Synchronizer.getInstance().findCommonBlocksWithPeers(peers); + // Synchronizer.getInstance().findCommonBlocksWithPeers(peers); // Compare the peers against each other, and against our chain, which will return an updated list excluding those without common blocks - peers = Synchronizer.getInstance().comparePeers(peers); + // peers = Synchronizer.getInstance().comparePeers(peers); } // We may have added more inferior chain tips when comparing peers, so remove any peers that are currently on those chains