From 688404011b3dd80e4c6de52b7e96457139f5be78 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sun, 30 May 2021 10:08:50 +0100 Subject: [PATCH] Relocate FETCH_BLOCKS_TIMEOUT to Peer.java and use a static import. --- src/main/java/org/qortal/controller/Synchronizer.java | 5 +++-- src/main/java/org/qortal/network/Peer.java | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/qortal/controller/Synchronizer.java b/src/main/java/org/qortal/controller/Synchronizer.java index a0ffaff9..185e77a0 100644 --- a/src/main/java/org/qortal/controller/Synchronizer.java +++ b/src/main/java/org/qortal/controller/Synchronizer.java @@ -42,6 +42,8 @@ import org.qortal.transaction.Transaction; import org.qortal.utils.Base58; import org.qortal.utils.NTP; +import static org.qortal.network.Peer.FETCH_BLOCKS_TIMEOUT; + public class Synchronizer { private static final Logger LOGGER = LogManager.getLogger(Synchronizer.class); @@ -63,8 +65,7 @@ public class Synchronizer { /* Minimum peer version that supports syncing multiple blocks at once via GetBlocksMessage */ private static final long PEER_VERSION_160 = 0x0100060000L; - /** Maximum time to wait for a peer to respond with blocks (ms) */ - private static final int FETCH_BLOCKS_TIMEOUT = 10000; + private static Synchronizer instance; diff --git a/src/main/java/org/qortal/network/Peer.java b/src/main/java/org/qortal/network/Peer.java index e50c18d6..8c364dc7 100644 --- a/src/main/java/org/qortal/network/Peer.java +++ b/src/main/java/org/qortal/network/Peer.java @@ -47,6 +47,11 @@ public class Peer { */ private static final int RESPONSE_TIMEOUT = 3000; // ms + /** + * Maximum time to wait for a peer to respond with blocks (ms) + */ + public static final int FETCH_BLOCKS_TIMEOUT = 10000; + /** * Interval between PING messages to a peer. (ms) *