masternodesync: connect the not-connected ProcessSyncStatusMsg.

Before, this function was being totally skipped for the tiertwo_networksync dispatcher function. The dispatcher internally processes `syncstatusaccount` messages and return true, which means that the message was processed, there by, it was never reaching the `masternodeSync.ProcessMessage` call in net_processing. Github-Pull: bitcoin#2659 Rebased-From: ae28000
furszy · Dec 14, 2021 · ebbef96 · ebbef96
1 parent 281c061
commit ebbef96
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
@@ -220,17 +220,12 @@ std::string CMasternodeSync::GetSyncStatus()
     return "";
 }
 
-void CMasternodeSync::ProcessMessage(CNode* pfrom, std::string& strCommand, CDataStream& vRecv)
+void CMasternodeSync::ProcessSyncStatusMsg(int nItemID, int nCount)
 {
-    if (strCommand == NetMsgType::SYNCSTATUSCOUNT) { //Sync status count
-        int nItemID;
-        int nCount;
-        vRecv >> nItemID >> nCount;
+    if (RequestedMasternodeAssets >= MASTERNODE_SYNC_FINISHED) return;
 
-        if (RequestedMasternodeAssets >= MASTERNODE_SYNC_FINISHED) return;
-
-        //this means we will receive no further communication
-        switch (nItemID) {
+    //this means we will receive no further communication
+    switch (nItemID) {
         case (MASTERNODE_SYNC_LIST):
             if (nItemID != RequestedMasternodeAssets) return;
             sumMasternodeList += nCount;
@@ -251,10 +246,11 @@ void CMasternodeSync::ProcessMessage(CNode* pfrom, std::string& strCommand, CDat
             sumBudgetItemFin += nCount;
             countBudgetItemFin++;
             break;
-        }
-
-        LogPrint(BCLog::MASTERNODE, "CMasternodeSync:ProcessMessage - ssc - got inventory count %d %d\n", nItemID, nCount);
+        default:
+            break;
     }
+
+    LogPrint(BCLog::MASTERNODE, "CMasternodeSync:ProcessMessage - ssc - got inventory count %d %d\n", nItemID, nCount);
 }
 
 void CMasternodeSync::ClearFulfilledRequest()

diff --git a/src/masternode-sync.h b/src/masternode-sync.h
@@ -79,7 +79,7 @@ class CMasternodeSync
     void AddedBudgetItem(const uint256& hash);
     void SwitchToNextAsset();
     std::string GetSyncStatus();
-    void ProcessMessage(CNode* pfrom, std::string& strCommand, CDataStream& vRecv);
+    void ProcessSyncStatusMsg(int nItemID, int itemCount);
     bool IsBudgetFinEmpty();
     bool IsBudgetPropEmpty();
 

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -1924,7 +1924,6 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
                 g_budgetman.ProcessMessage(pfrom, strCommand, vRecv);
                 masternodePayments.ProcessMessageMasternodePayments(pfrom, strCommand, vRecv);
                 sporkManager.ProcessSpork(pfrom, strCommand, vRecv);
-                masternodeSync.ProcessMessage(pfrom, strCommand, vRecv);
             }
         } else {
             // Ignore unknown commands for extensibility

diff --git a/src/tiertwo_networksync.cpp b/src/tiertwo_networksync.cpp
@@ -93,6 +93,9 @@ bool CMasternodeSync::MessageDispatcher(CNode* pfrom, std::string& strCommand, C
         int nCount;
         vRecv >> nItemID >> nCount;
 
+        // Update stats
+        ProcessSyncStatusMsg(nItemID, nCount);
+
         // this means we will receive no further communication on the first sync
         switch (nItemID) {
             case MASTERNODE_SYNC_LIST: {