refactor: cleanup unused members, includes and forward declaration after sporks removal

Author: knst

src/evo/chainhelper.cpp

@@ -18,13 +18,12 @@ CChainstateHelper::CChainstateHelper(CEvoDB& evodb, CDeterministicMNManager& dmn
                                      llmq::CInstantSendManager& isman, llmq::CQuorumBlockProcessor& qblockman,
                                      llmq::CQuorumSnapshotManager& qsnapman, const ChainstateManager& chainman,
                                      const Consensus::Params& consensus_params, const CMasternodeSync& mn_sync,
-                                     const CSporkManager& sporkman, const chainlock::Chainlocks& chainlocks,
-                                     const llmq::CQuorumManager& qman) :
+                                     const chainlock::Chainlocks& chainlocks, const llmq::CQuorumManager& qman) :
     isman{isman},
     credit_pool_manager{std::make_unique<CCreditPoolManager>(evodb, chainman)},
     m_chainlocks{chainlocks},
     ehf_manager{std::make_unique<CMNHFManager>(evodb, chainman, qman)},
-    mn_payments{std::make_unique<CMNPaymentsProcessor>(dmnman, govman, chainman, consensus_params, mn_sync, sporkman)},
+    mn_payments{std::make_unique<CMNPaymentsProcessor>(dmnman, govman, chainman, consensus_params, mn_sync)},
     special_tx{std::make_unique<CSpecialTxProcessor>(*credit_pool_manager, dmnman, *ehf_manager, qblockman, qsnapman,
                                                      chainman, consensus_params, chainlocks, qman)}
 {}

src/evo/chainhelper.h

@@ -19,7 +19,6 @@ class CMasternodeSync;
 class CMNHFManager;
 class CMNPaymentsProcessor;
 class CSpecialTxProcessor;
-class CSporkManager;
 class CTransaction;
 class uint256;
 struct CCreditPool;
@@ -61,8 +60,7 @@ class CChainstateHelper
                                llmq::CInstantSendManager& isman, llmq::CQuorumBlockProcessor& qblockman,
                                llmq::CQuorumSnapshotManager& qsnapman, const ChainstateManager& chainman,
                                const Consensus::Params& consensus_params, const CMasternodeSync& mn_sync,
-                               const CSporkManager& sporkman, const chainlock::Chainlocks& chainlocks,
-                               const llmq::CQuorumManager& qman);
+                               const chainlock::Chainlocks& chainlocks, const llmq::CQuorumManager& qman);
     ~CChainstateHelper();
 
     /** Passthrough functions to chainlock::Chainlocks */

src/governance/governance.cpp

@@ -11,16 +11,17 @@
 #include <governance/validators.h>
 #include <masternode/meta.h>
 #include <masternode/sync.h>
-#include <spork.h>
 
 #include <chain.h>
 #include <chainparams.h>
 #include <common/bloom.h>
 #include <deploymentstatus.h>
+#include <net.h>
 #include <node/interface_ui.h>
 #include <protocol.h>
 #include <shutdown.h>
 #include <timedata.h>
+#include <util/check.h>
 #include <util/thread.h>
 #include <util/time.h>
 #include <validationinterface.h>

src/governance/governance.h

@@ -40,7 +40,6 @@ class CGovernanceObject;
 class CGovernanceVote;
 class CMasternodeMetaMan;
 class CMasternodeSync;
-class CSporkManager;
 class CSuperblock;
 
 class UniValue;

src/masternode/payments.h

@@ -17,7 +17,6 @@ class CGovernanceManager;
 class ChainstateManager;
 class CMasternodeSync;
 class CTransaction;
-class CSporkManager;
 class CTxOut;
 
 struct CMutableTransaction;
@@ -38,7 +37,6 @@ class CMNPaymentsProcessor
     const ChainstateManager& m_chainman;
     const Consensus::Params& m_consensus_params;
     const CMasternodeSync& m_mn_sync;
-    const CSporkManager& m_sporkman;
 
 private:
     [[nodiscard]] bool GetBlockTxOuts(const CBlockIndex* pindexPrev, const CAmount blockSubsidy, const CAmount feeReward,
@@ -51,9 +49,8 @@ class CMNPaymentsProcessor
 
 public:
     explicit CMNPaymentsProcessor(CDeterministicMNManager& dmnman, CGovernanceManager& govman, const ChainstateManager& chainman,
-                                  const Consensus::Params& consensus_params, const CMasternodeSync& mn_sync, const CSporkManager& sporkman) :
-        m_dmnman{dmnman}, m_govman{govman}, m_chainman{chainman}, m_consensus_params{consensus_params}, m_mn_sync{mn_sync},
-        m_sporkman{sporkman} {}
+                                  const Consensus::Params& consensus_params, const CMasternodeSync& mn_sync) :
+        m_dmnman{dmnman}, m_govman{govman}, m_chainman{chainman}, m_consensus_params{consensus_params}, m_mn_sync{mn_sync} {}
 
     bool IsBlockValueValid(const CBlock& block, const int nBlockHeight, const CAmount blockReward, std::string& strErrorRet, const bool check_superblock);
     bool IsBlockPayeeValid(const CTransaction& txNew, const CBlockIndex* pindexPrev, const CAmount blockSubsidy, const CAmount feeReward, const bool check_superblock);

src/node/chainstate.cpp

@@ -236,7 +236,7 @@ void DashChainstateSetup(ChainstateManager& chainman,
     mempool->ConnectManagers(dmnman.get(), llmq_ctx->isman.get());
     chain_helper.reset();
     chain_helper = std::make_unique<CChainstateHelper>(evodb, *dmnman, govman, *(llmq_ctx->isman), *(llmq_ctx->quorum_block_processor),
-                                                       *(llmq_ctx->qsnapman), chainman, consensus_params, mn_sync, sporkman, chainlocks,
+                                                       *(llmq_ctx->qsnapman), chainman, consensus_params, mn_sync, chainlocks,
                                                        *(llmq_ctx->qman));
 }
 

src/rpc/mining.cpp

@@ -14,10 +14,12 @@
 #include <core_io.h>
 #include <deploymentinfo.h>
 #include <deploymentstatus.h>
+#include <governance/classes.h>
 #include <key_io.h>
 #include <llmq/blockprocessor.h>
 #include <llmq/context.h>
 #include <evo/evodb.h>
+#include <masternode/sync.h>
 #include <net.h>
 #include <node/context.h>
 #include <node/miner.h>
@@ -42,10 +44,6 @@
 #include <validationinterface.h>
 #include <warnings.h>
 
-#include <governance/classes.h>
-#include <governance/governance.h>
-#include <masternode/sync.h>
-
 #include <memory>
 #include <stdint.h>
 

test/functional/feature_governance_cl.py

@@ -55,8 +55,6 @@ def run_test(self):
         self.sync_blocks()
         self.wait_for_chainlocked_block_all_nodes(self.nodes[0].getbestblockhash())
 
-        self.wait_for_sporks_same()
-
         # Move to the superblock cycle start block
         n = sb_cycle - self.nodes[0].getblockcount() % sb_cycle
         if n > 0: