refactor: move DoMaintenance() inside Schedule()

Author: kwvg

src/governance/governance.cpp

@@ -88,10 +88,23 @@ CGovernanceManager::~CGovernanceManager()
     m_db->Store(*this);
 }
 
-void CGovernanceManager::Schedule(CScheduler& scheduler, PeerManager& peerman)
+void CGovernanceManager::Schedule(CScheduler& scheduler, CConnman& connman, PeerManager& peerman)
 {
     assert(IsValid());
 
+    scheduler.scheduleEvery(
+        [this, &connman]() -> void {
+            if (!m_mn_sync.IsSynced()) return;
+
+            // CHECK OBJECTS WE'VE ASKED FOR, REMOVE OLD ENTRIES
+            CleanOrphanObjects();
+            RequestOrphanObjects(connman);
+
+            // CHECK AND REMOVE - REPROCESS GOVERNANCE OBJECTS
+            CheckAndRemove();
+        },
+        std::chrono::minutes{5});
+
     scheduler.scheduleEvery(
         [this, &peerman]() -> void {
             LOCK(cs_relay);
@@ -652,20 +665,6 @@ struct sortProposalsByVotes {
     }
 };
 
-void CGovernanceManager::DoMaintenance(CConnman& connman)
-{
-    if (!IsValid()) return;
-    if (!m_mn_sync.IsSynced()) return;
-    if (ShutdownRequested()) return;
-
-    // CHECK OBJECTS WE'VE ASKED FOR, REMOVE OLD ENTRIES
-    CleanOrphanObjects();
-    RequestOrphanObjects(connman);
-
-    // CHECK AND REMOVE - REPROCESS GOVERNANCE OBJECTS
-    CheckAndRemove();
-}
-
 bool CGovernanceManager::ConfirmInventoryRequest(const CInv& inv)
 {
     // do not request objects until it's time to sync

src/governance/governance.h

@@ -281,7 +281,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
                                 const std::unique_ptr<CDeterministicMNManager>& dmnman, CMasternodeSync& mn_sync);
     ~CGovernanceManager();
 
-    void Schedule(CScheduler& scheduler, PeerManager& peerman);
+    void Schedule(CScheduler& scheduler, CConnman& connman, PeerManager& peerman);
 
     bool LoadCache(bool load_cache);
 
@@ -303,8 +303,6 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
-    void DoMaintenance(CConnman& connman);
-
     const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
     CGovernanceObject* FindGovernanceObject(const uint256& nHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
     CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);

src/init.cpp

@@ -2262,8 +2262,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     node.scheduler->scheduleEvery(std::bind(&CDeterministicMNManager::DoMaintenance, std::ref(*node.dmnman)), std::chrono::seconds{10});
 
     if (node.govman->IsValid()) {
-        node.govman->Schedule(*node.scheduler, *node.peerman);
-        node.scheduler->scheduleEvery(std::bind(&CGovernanceManager::DoMaintenance, std::ref(*node.govman), std::ref(*node.connman)), std::chrono::minutes{5});
+        node.govman->Schedule(*node.scheduler, *node.connman, *node.peerman);
     }
 
     if (node.mn_activeman) {