mnsync: decouple IsBlockchainSync into a publicly available g_tiertwo…

…_sync_state class which only stores the final value.
PIVX-Project · Jan 17, 2022 · 6015d90 · 6015d90
1 parent 038191c
commit 6015d90
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/evo/mnauth.cpp b/src/evo/mnauth.cpp
@@ -7,12 +7,14 @@
 
 #include "activemasternode.h"
 #include "chainparams.h"
-#include "masternode-sync.h"  // for IsBlockchainSynced
+#include "consensus/validation.h"
 #include "tiertwo/masternode_meta_manager.h"
 #include "netmessagemaker.h"
 #include "llmq/quorums_utils.h"
 #include "util/system.h" // for fMasternode and gArgs access
 #include "tiertwo/net_masternodes.h"
+#include "tiertwo/tiertwo_sync_state.h"
+
 #include "version.h" // for MNAUTH_NODE_VER_VERSION
 
 void CMNAuth::PushMNAUTH(CNode* pnode, CConnman& connman)
@@ -56,7 +58,7 @@ void CMNAuth::PushMNAUTH(CNode* pnode, CConnman& connman)
 
 bool CMNAuth::ProcessMessage(CNode* pnode, const std::string& strCommand, CDataStream& vRecv, CConnman& connman, CValidationState& state)
 {
-    if (!masternodeSync.IsBlockchainSynced()) {
+    if (!g_tiertwo_sync_state.IsBlockchainSynced()) {
         // we can't verify MNAUTH messages when we don't have the latest MN list
         return true;
     }

diff --git a/src/tiertwo/net_masternodes.cpp b/src/tiertwo/net_masternodes.cpp
@@ -10,7 +10,7 @@
 #include "evo/deterministicmns.h"
 #include "scheduler.h"
 #include "tiertwo/masternode_meta_manager.h" // for g_mmetaman
-#include "masternode-sync.h" // for IsBlockchainSynced
+#include "tiertwo/tiertwo_sync_state.h"
 #include "netmessagemaker.h"
 
 TierTwoConnMan::TierTwoConnMan(CConnman* _connman) : connman(_connman) {}
@@ -188,7 +188,7 @@ void TierTwoConnMan::ThreadOpenMasternodeConnections()
         triedConnect = false;
 
         // todo: add !fNetworkActive
-        if (!masternodeSync.IsBlockchainSynced()) {
+        if (!g_tiertwo_sync_state.IsBlockchainSynced()) {
             continue;
         }
 
@@ -372,7 +372,7 @@ static void ProcessMasternodeConnections(CConnman& connman, TierTwoConnMan& tier
 
 void TierTwoConnMan::doMaintenance()
 {
-    if(!masternodeSync.IsBlockchainSynced() || interruptNet) {
+    if(!g_tiertwo_sync_state.IsBlockchainSynced() || interruptNet) {
         return;
     }
     ProcessMasternodeConnections(*connman, *this);