refactor: abstract away parent implementation from signer

kwvg · kwvg · commit 63448ff1cc50 · 2025-10-16T05:06:19.000+05:30
diff --git a/src/governance/governance.h b/src/governance/governance.h
@@ -7,12 +7,16 @@
 
 #include <cachemap.h>
 #include <cachemultimap.h>
+#include <governance/signing.h>
+
 #include <protocol.h>
 #include <sync.h>
 
+#include <chrono>
 #include <limits>
 #include <map>
 #include <memory>
+#include <optional>
 #include <set>
 #include <string>
 #include <string_view>
@@ -236,7 +240,7 @@ class GovernanceStore
 //
 // Governance Manager : Contains all proposals for the budget
 //
-class CGovernanceManager : public GovernanceStore
+class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 {
     friend class CGovernanceObject;
 
@@ -275,7 +279,7 @@ class CGovernanceManager : public GovernanceStore
 
     bool LoadCache(bool load_cache);
 
-    bool IsValid() const { return is_valid; }
+    bool IsValid() const override { return is_valid; }
 
     /**
      * This is called by AlreadyHave in net_processing.cpp as part of the inventory
@@ -292,15 +296,15 @@ class CGovernanceManager : public GovernanceStore
     void DoMaintenance(CConnman& connman);
 
     const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
-    CGovernanceObject* FindGovernanceObject(const uint256& nHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    CGovernanceObject* FindGovernanceObject(const uint256& nHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void DeleteGovernanceObject(const uint256& nHash);
 
     // These commands are only used in RPC
     std::vector<CGovernanceVote> GetCurrentVotes(const uint256& nParentHash, const COutPoint& mnCollateralOutpointFilter) const;
     void GetAllNewerThan(std::vector<CGovernanceObject>& objs, int64_t nMoreThanTime) const;
 
-    void AddGovernanceObject(CGovernanceObject& govobj, PeerManager& peerman, const CNode* pfrom = nullptr);
+    void AddGovernanceObject(CGovernanceObject& govobj, PeerManager& peerman, const CNode* pfrom = nullptr) override;
 
     void CheckAndRemove();
 
@@ -310,7 +314,7 @@ class CGovernanceManager : public GovernanceStore
     int64_t GetLastDiffTime() const { return nTimeLastDiff; }
     void UpdateLastDiffTime(int64_t nTimeIn) { nTimeLastDiff = nTimeIn; }
 
-    int GetCachedBlockHeight() const { return nCachedBlockHeight; }
+    int GetCachedBlockHeight() const override { return nCachedBlockHeight; }
 
     // Accessors for thread-safe access to maps
     bool HaveObjectForHash(const uint256& nHash) const;
@@ -327,11 +331,11 @@ class CGovernanceManager : public GovernanceStore
 
     void MasternodeRateUpdate(const CGovernanceObject& govobj);
 
-    bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false);
+    bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) override;
 
     bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus, bool fForce, bool& fRateCheckBypassed);
 
-    bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman, PeerManager& peerman);
+    bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman, PeerManager& peerman) override;
 
     void CheckPostponedObjects(PeerManager& peerman);
 
@@ -352,7 +356,7 @@ class CGovernanceManager : public GovernanceStore
      *   - Track governance objects which are triggers
      *   - After triggers are activated and executed, they can be removed
     */
-    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const override EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool AddNewTrigger(uint256 nHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
     void CleanAndRemoveTriggers() EXCLUSIVE_LOCKS_REQUIRED(cs);
 
@@ -376,10 +380,10 @@ class CGovernanceManager : public GovernanceStore
     bool IsValidSuperblock(const CChain& active_chain, const CDeterministicMNList& tip_mn_list,
                            const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
 
-    bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet, int nBlockHeight)
+    bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet, int nBlockHeight) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list)
+    std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
 private:
diff --git a/src/governance/signing.cpp b/src/governance/signing.cpp
@@ -6,7 +6,6 @@
 
 #include <evo/deterministicmns.h>
 #include <governance/classes.h>
-#include <governance/governance.h>
 #include <masternode/node.h>
 #include <masternode/sync.h>
 
@@ -18,7 +17,7 @@
 
 #include <algorithm>
 
-GovernanceSigner::GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, CGovernanceManager& govman,
+GovernanceSigner::GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, GovernanceSignerParent& govman,
                                    PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
                                    const ChainstateManager& chainman, const CMasternodeSync& mn_sync) :
     m_connman{connman},
diff --git a/src/governance/signing.h b/src/governance/signing.h
@@ -10,24 +10,46 @@
 
 #include <uint256.h>
 
+#include <memory>
 #include <optional>
+#include <vector>
 
 class CActiveMasternodeManager;
 class CBlockIndex;
 class CConnman;
+class CDeterministicMNList;
 class CDeterministicMNManager;
-class CGovernanceManager;
+class CGovernanceException;
+class CGovernanceVote;
 class ChainstateManager;
 class CMasternodeSync;
+class CNode;
 class PeerManager;
 enum vote_outcome_enum_t : int;
 
+class GovernanceSignerParent
+{
+public:
+    virtual ~GovernanceSignerParent() = default;
+
+    virtual bool IsValid() const = 0;
+    virtual bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, std::shared_ptr<CSuperblock>& pSuperblockRet, int nBlockHeight) = 0;
+    virtual bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) = 0;
+    virtual bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman, PeerManager& peerman) = 0;
+    virtual int GetCachedBlockHeight() const = 0;
+    virtual CGovernanceObject* FindGovernanceObject(const uint256& nHash) = 0;
+    virtual CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) = 0;
+    virtual std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const = 0;
+    virtual std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) = 0;
+    virtual void AddGovernanceObject(CGovernanceObject& govobj, PeerManager& peerman, const CNode* pfrom = nullptr) = 0;
+};
+
 class GovernanceSigner
 {
 private:
     CConnman& m_connman;
     CDeterministicMNManager& m_dmnman;
-    CGovernanceManager& m_govman;
+    GovernanceSignerParent& m_govman;
     PeerManager& m_peerman;
     const CActiveMasternodeManager& m_mn_activeman;
     const ChainstateManager& m_chainman;
@@ -37,7 +59,7 @@ class GovernanceSigner
     std::optional<uint256> votedFundingYesTriggerHash{std::nullopt};
 
 public:
-    explicit GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, CGovernanceManager& govman,
+    explicit GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, GovernanceSignerParent& govman,
                               PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
                               const ChainstateManager& chainman, const CMasternodeSync& mn_sync);
     ~GovernanceSigner();
diff --git a/src/masternode/active/context.cpp b/src/masternode/active/context.cpp
@@ -7,6 +7,7 @@
 #include <chainlock/chainlock.h>
 #include <chainlock/signing.h>
 #include <coinjoin/server.h>
+#include <governance/governance.h>
 #include <governance/signing.h>
 #include <instantsend/instantsend.h>
 #include <instantsend/signing.h>
