refactor: make bootStrapLoaded private and add a getter

Signed-off-by: HashEngineering <[email protected]>
dashpay · Jul 12, 2024 · a559bca · a559bca
1 parent 2c8bd40
commit a559bca
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/core/src/main/java/org/bitcoinj/evolution/AbstractQuorumState.java b/core/src/main/java/org/bitcoinj/evolution/AbstractQuorumState.java
@@ -119,19 +119,19 @@ boolean initChainTipSyncComplete() {
     String bootstrapFilePath = null;
     InputStream bootstrapStream = null;
     int bootStrapFileFormat = 0;
-    public SettableFuture<Boolean> bootStrapLoaded;
+    private SettableFuture<Boolean> bootStrapLoaded;
 
     boolean isLoadingBootstrap = false;
     protected static Random random = new Random();
 
-    public AbstractQuorumState(Context context) {
+    protected AbstractQuorumState(Context context) {
         super(context.getParams());
         this.context = context;
         initializeOnce();
         initialize();
     }
 
-    public AbstractQuorumState(NetworkParameters params, byte[] payload, int offset, int protocolVersion) {
+    protected AbstractQuorumState(NetworkParameters params, byte[] payload, int offset, int protocolVersion) {
         super(params, payload, offset, protocolVersion);
         initialize();
     }
@@ -200,6 +200,10 @@ public boolean reachedMaxFailedAttempts() {
         return failedAttempts > MAX_ATTEMPTS;
     }
 
+    public SettableFuture<Boolean> getBootStrapLoadedFuture() {
+        return bootStrapLoaded;
+    }
+
     abstract int getBlockHeightOffset();
 
     public abstract int getUpdateInterval();
@@ -231,13 +235,13 @@ public void retryLastUpdate(Peer peer) {
 
     public abstract SimplifiedMasternodeList getMasternodeListAtTip();
 
-    public abstract LinkedHashMap<Sha256Hash, SimplifiedMasternodeList> getMasternodeListCache();
+    public abstract Map<Sha256Hash, SimplifiedMasternodeList> getMasternodeListCache();
 
-    public abstract LinkedHashMap<Sha256Hash, SimplifiedQuorumList> getQuorumsCache();
+    public abstract Map<Sha256Hash, SimplifiedQuorumList> getQuorumsCache();
 
     public abstract SimplifiedQuorumList getQuorumListAtTip();
 
-    public abstract ArrayList<Masternode> getAllQuorumMembers(LLMQParameters.LLMQType llmqType, Sha256Hash blockHash);
+    public abstract List<Masternode> getAllQuorumMembers(LLMQParameters.LLMQType llmqType, Sha256Hash blockHash);
 
     public void resetMNList() {
         resetMNList(false, true);

diff --git a/core/src/main/java/org/bitcoinj/evolution/SimplifiedMasternodeListManager.java b/core/src/main/java/org/bitcoinj/evolution/SimplifiedMasternodeListManager.java
@@ -103,11 +103,11 @@ public StoredBlock getBlockTip() {
     }
 
     public void waitForBootstrapLoaded() throws ExecutionException, InterruptedException {
-        if (quorumState.bootStrapLoaded != null) {
-            quorumState.bootStrapLoaded.get();
+        if (quorumState.getBootStrapLoadedFuture() != null) {
+            quorumState.getBootStrapLoadedFuture().get();
         }
-        if (quorumRotationState.bootStrapLoaded != null) {
-            quorumRotationState.bootStrapLoaded.get();
+        if (quorumRotationState.getBootStrapLoadedFuture() != null) {
+            quorumRotationState.getBootStrapLoadedFuture().get();
         }
     }