refactor: move ProcessMessage from CMasternodeSync to SyncManager

knst · knst · commit 9ac269ce40d7 · 2025-12-13T04:41:05.000+07:00
diff --git a/src/masternode/sync.cpp b/src/masternode/sync.cpp
@@ -73,7 +73,7 @@ void CMasternodeSync::SwitchToNextAsset()
             LogPrintf("CMasternodeSync::SwitchToNextAsset -- Completed %s in %llds\n", GetAssetName(), GetTime() - nTimeAssetSyncStarted);
             nCurrentAsset = MASTERNODE_SYNC_FINISHED;
             uiInterface.NotifyAdditionalDataSyncProgressChanged(1);
-
+            // TODO: move connman to notifier
             connman.ForEachNode(CConnman::AllNodes, [this](const CNode* pnode) {
                 m_netfulfilledman.AddFulfilledRequest(pnode->addr, "full-sync");
             });
@@ -96,21 +96,6 @@ std::string CMasternodeSync::GetSyncStatus() const
     }
 }
 
-void CMasternodeSync::ProcessMessage(const CNode& peer, std::string_view msg_type, CDataStream& vRecv) const
-{
-    //Sync status count
-    if (msg_type != NetMsgType::SYNCSTATUSCOUNT) return;
-
-    //do not care about stats if sync process finished
-    if (IsSynced()) return;
-
-    int nItemID;
-    int nCount;
-    vRecv >> nItemID >> nCount;
-
-    LogPrint(BCLog::MNSYNC, "SYNCSTATUSCOUNT -- got inventory count: nItemID=%d  nCount=%d  peer=%d\n", nItemID, nCount, peer.GetId());
-}
-
 void CMasternodeSync::AcceptedBlockHeader(const CBlockIndex *pindexNew)
 {
     LogPrint(BCLog::MNSYNC, "CMasternodeSync::AcceptedBlockHeader -- pindexNew->nHeight: %d\n", pindexNew->nHeight);
diff --git a/src/masternode/sync.h b/src/masternode/sync.h
@@ -9,10 +9,8 @@
 
 class CConnman;
 class CBlockIndex;
-class CDataStream;
 class CMasternodeSync;
 class CNetFulfilledRequestManager;
-class CNode;
 
 /** Default for -syncmempool */
 static const bool DEFAULT_SYNC_MEMPOOL = true;
@@ -75,8 +73,6 @@ class CMasternodeSync
     void Reset(bool fForce = false, bool fNotifyReset = true);
     void SwitchToNextAsset();
 
-    void ProcessMessage(const CNode& peer, std::string_view msg_type, CDataStream& vRecv) const;
-
     void AcceptedBlockHeader(const CBlockIndex *pindexNew);
     void NotifyHeaderTip(const CBlockIndex *pindexNew, bool fInitialDownload);
     void UpdatedBlockTip(const CBlockIndex *pindexTip, const CBlockIndex *pindexNew, bool fInitialDownload);
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -5446,7 +5446,6 @@ void PeerManagerImpl::ProcessMessage(
             m_active_ctx->shareman->ProcessMessage(pfrom, msg_type, vRecv);
         }
         PostProcessMessage(m_sporkman.ProcessMessage(pfrom, m_connman, msg_type, vRecv), pfrom.GetId());
-        m_mn_sync.ProcessMessage(pfrom, msg_type, vRecv);
         PostProcessMessage(CMNAuth::ProcessMessage(pfrom, peer->m_their_services, m_connman, m_mn_metaman, m_mn_activeman, m_mn_sync, m_dmnman->GetListAtChainTip(), msg_type, vRecv), pfrom.GetId());
         PostProcessMessage(m_llmq_ctx->quorum_block_processor->ProcessMessage(pfrom, msg_type, vRecv), pfrom.GetId());
         PostProcessMessage(m_llmq_ctx->qdkgsman->ProcessMessage(pfrom, is_masternode, msg_type, vRecv), pfrom.GetId());
diff --git a/src/node/sync_manager.cpp b/src/node/sync_manager.cpp
@@ -318,3 +318,18 @@ void SyncManager::ProcessTick(CConnman& connman)
         }
     }
 }
+
+void SyncManager::ProcessMessage(CNode& peer, CConnman&, const std::string& msg_type, CDataStream& vRecv)
+{
+    //Sync status count
+    if (msg_type != NetMsgType::SYNCSTATUSCOUNT) return;
+
+    //do not care about stats if sync process finished
+    if (m_node_sync.IsSynced()) return;
+
+    int nItemID;
+    int nCount;
+    vRecv >> nItemID >> nCount;
+
+    LogPrint(BCLog::MNSYNC, "SYNCSTATUSCOUNT -- got inventory count: nItemID=%d  nCount=%d  peer=%d\n", nItemID, nCount, peer.GetId());
+}
diff --git a/src/node/sync_manager.h b/src/node/sync_manager.h
@@ -23,6 +23,7 @@ class SyncManager final : public NetHandler
     {
     }
     void Schedule(CScheduler& scheduler, CConnman& connman) override;
+    void ProcessMessage(CNode& peer, CConnman&, const std::string& msg_type, CDataStream& vRecv) override;
 
 private:
     void SendGovernanceSyncRequest(CNode* pnode, CConnman& connman) const;

Original file line number	Diff line number	Diff line change
`@@ -5446,7 +5446,6 @@ void PeerManagerImpl::ProcessMessage(`
`5446`	`5446`	`m_active_ctx->shareman->ProcessMessage(pfrom, msg_type, vRecv);`
`5447`	`5447`	`}`
`5448`	`5448`	`PostProcessMessage(m_sporkman.ProcessMessage(pfrom, m_connman, msg_type, vRecv), pfrom.GetId());`
`5449`		`- m_mn_sync.ProcessMessage(pfrom, msg_type, vRecv);`
`5450`	`5449`	`PostProcessMessage(CMNAuth::ProcessMessage(pfrom, peer->m_their_services, m_connman, m_mn_metaman, m_mn_activeman, m_mn_sync, m_dmnman->GetListAtChainTip(), msg_type, vRecv), pfrom.GetId());`
`5451`	`5450`	`PostProcessMessage(m_llmq_ctx->quorum_block_processor->ProcessMessage(pfrom, msg_type, vRecv), pfrom.GetId());`
`5452`	`5451`	`PostProcessMessage(m_llmq_ctx->qdkgsman->ProcessMessage(pfrom, is_masternode, msg_type, vRecv), pfrom.GetId());`
Original file line number	Diff line number	Diff line change
`@@ -318,3 +318,18 @@ void SyncManager::ProcessTick(CConnman& connman)`
`318`	`318`	`}`
`319`	`319`	`}`
`320`	`320`	`}`
	`321`	`+`
	`322`	`+void SyncManager::ProcessMessage(CNode& peer, CConnman&, const std::string& msg_type, CDataStream& vRecv)`
	`323`	`+{`
	`324`	`+ //Sync status count`
	`325`	`+ if (msg_type != NetMsgType::SYNCSTATUSCOUNT) return;`
	`326`	`+`
	`327`	`+ //do not care about stats if sync process finished`
	`328`	`+ if (m_node_sync.IsSynced()) return;`
	`329`	`+`
	`330`	`+ int nItemID;`
	`331`	`+ int nCount;`
	`332`	`+ vRecv >> nItemID >> nCount;`
	`333`	`+`
	`334`	`+ LogPrint(BCLog::MNSYNC, "SYNCSTATUSCOUNT -- got inventory count: nItemID=%d nCount=%d peer=%d\n", nItemID, nCount, peer.GetId());`
	`335`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ class SyncManager final : public NetHandler`
`23`	`23`	`{`
`24`	`24`	`}`
`25`	`25`	`void Schedule(CScheduler& scheduler, CConnman& connman) override;`
	`26`	`+ void ProcessMessage(CNode& peer, CConnman&, const std::string& msg_type, CDataStream& vRecv) override;`
`26`	`27`
`27`	`28`	`private:`
`28`	`29`	`void SendGovernanceSyncRequest(CNode* pnode, CConnman& connman) const;`