refactor: create InstantSendStorage to break circular dependency over instantsend/signing

Author: knst

src/instantsend/instantsend.h

@@ -12,6 +12,7 @@
 #include <threadinterrupt.h>
 #include <threadsafety.h>
 
+#include <instantsend/signing.h>
 #include <instantsend/db.h>
 #include <instantsend/lock.h>
 #include <unordered_lru_cache.h>
@@ -43,7 +44,7 @@ class CQuorumManager;
 class CSigningManager;
 class CSigSharesManager;
 
-class CInstantSendManager
+class CInstantSendManager final : public instantsend::InstantSendStorage
 {
 private:
     CInstantSendDb db;
@@ -128,9 +129,9 @@ class CInstantSendManager
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingRetry);
 
 public:
-    bool IsLocked(const uint256& txHash) const;
+    bool IsLocked(const uint256& txHash) const override;
     bool IsWaitingForTx(const uint256& txHash) const EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingLocks);
-    CInstantSendLockPtr GetConflictingLock(const CTransaction& tx) const;
+    CInstantSendLockPtr GetConflictingLock(const CTransaction& tx) const override;
 
     PeerMsgRet ProcessMessage(const CNode& pfrom, PeerManager& peerman, std::string_view msg_type, CDataStream& vRecv);
 
@@ -152,12 +153,12 @@ class CInstantSendManager
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingRetry);
 
     void RemoveConflictingLock(const uint256& islockHash, const CInstantSendLock& islock);
-    void TryEmplacePendingLock(const uint256& hash, const NodeId id, const CInstantSendLockPtr& islock)
+    void TryEmplacePendingLock(const uint256& hash, const NodeId id, const CInstantSendLockPtr& islock) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingLocks);
 
     size_t GetInstantSendLockCount() const;
 
-    bool IsInstantSendEnabled() const;
+    bool IsInstantSendEnabled() const override;
     /**
      * If true, MN should sign all transactions, if false, MN should not sign
      * transactions in mempool, but should sign txes included in a block. This

src/instantsend/signing.cpp

@@ -11,7 +11,6 @@
 #include <util/irange.h>
 #include <validation.h>
 
-#include <instantsend/instantsend.h>
 #include <llmq/chainlocks.h>
 #include <llmq/quorums.h>
 #include <masternode/sync.h>
@@ -30,7 +29,7 @@ using node::fReindex;
 namespace instantsend {
 static const std::string_view INPUTLOCK_REQUESTID_PREFIX = "inlock";
 
-CSigningManager::CSigningManager(CChainState& chainstate, llmq::CChainLocksHandler& clhandler, llmq::CInstantSendManager& isman,
+CSigningManager::CSigningManager(CChainState& chainstate, llmq::CChainLocksHandler& clhandler, InstantSendStorage& isman,
                                  llmq::CSigningManager& sigman, llmq::CSigSharesManager& shareman, llmq::CQuorumManager& qman,
                                  CSporkManager& sporkman, CTxMemPool& mempool, const CMasternodeSync& mn_sync) :
     m_chainstate{chainstate},

src/instantsend/signing.h

@@ -22,15 +22,29 @@ class CInstantSendManager;
 class CSigningManager;
 class CSigSharesManager;
 class CQuorumManager;
+struct CInstantSendLock;
+using CInstantSendLockPtr = std::shared_ptr<CInstantSendLock>;
 } // namespace llmq
 
 namespace instantsend {
+
+class InstantSendStorage
+{
+public:
+    virtual ~InstantSendStorage() = default;
+
+    virtual bool IsInstantSendEnabled() const = 0;
+    virtual bool IsLocked(const uint256& txHash) const = 0;
+    virtual llmq::CInstantSendLockPtr GetConflictingLock(const CTransaction& tx) const = 0;
+    virtual void TryEmplacePendingLock(const uint256& hash, const NodeId id, const llmq::CInstantSendLockPtr& islock) = 0;
+};
+
 class CSigningManager : public llmq::CRecoveredSigsListener
 {
 private:
     CChainState& m_chainstate;
     llmq::CChainLocksHandler& m_clhandler;
-    llmq::CInstantSendManager& m_isman;
+    InstantSendStorage& m_isman;
     llmq::CSigningManager& m_sigman;
     llmq::CSigSharesManager& m_shareman;
     llmq::CQuorumManager& m_qman;
@@ -58,7 +72,7 @@ class CSigningManager : public llmq::CRecoveredSigsListener
     std::unordered_map<uint256, llmq::CInstantSendLock*, StaticSaltedHasher> txToCreatingInstantSendLocks GUARDED_BY(cs_creating);
 
 public:
-    explicit CSigningManager(CChainState& chainstate, llmq::CChainLocksHandler& clhandler, llmq::CInstantSendManager& isman,
+    explicit CSigningManager(CChainState& chainstate, llmq::CChainLocksHandler& clhandler, InstantSendStorage& isman,
                              llmq::CSigningManager& sigman, llmq::CSigSharesManager& shareman, llmq::CQuorumManager& qman,
                              CSporkManager& sporkman, CTxMemPool& mempool, const CMasternodeSync& mn_sync);
     ~CSigningManager();

test/lint/lint-circular-dependencies.py

@@ -53,7 +53,6 @@
     "governance/governance -> masternode/sync -> governance/governance",
     "governance/governance -> net_processing -> governance/governance",
     "governance/vote -> masternode/node -> validationinterface -> governance/vote",
-    "instantsend/instantsend -> instantsend/signing -> instantsend/instantsend",
     "instantsend/instantsend -> llmq/chainlocks -> instantsend/instantsend",
     "instantsend/instantsend -> net_processing -> instantsend/instantsend",
     "instantsend/instantsend -> net_processing -> llmq/context -> instantsend/instantsend",