refactor: drop CActiveMasternodeManager from chain state and LLMQContext (3/3)

knst · knst · commit 91f8f9b69633 · 2026-01-07T14:38:28.000+07:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -2012,7 +2012,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
                                               *node.mn_metaman,
                                               *node.mn_sync,
                                               *node.sporkman,
-                                              node.mn_activeman,
                                               node.chain_helper,
                                               node.cpoolman,
                                               node.dmnman,
diff --git a/src/llmq/context.h b/src/llmq/context.h
@@ -9,7 +9,6 @@
 
 #include <memory>
 
-class CActiveMasternodeManager;
 class CBLSWorker;
 class ChainstateManager;
 class CDeterministicMNManager;
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
@@ -40,7 +40,6 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
                                                      CMasternodeMetaMan& mn_metaman,
                                                      CMasternodeSync& mn_sync,
                                                      CSporkManager& sporkman,
-                                                     std::unique_ptr<CActiveMasternodeManager>& mn_activeman,
                                                      std::unique_ptr<CChainstateHelper>& chain_helper,
                                                      std::unique_ptr<CCreditPoolManager>& cpoolman,
                                                      std::unique_ptr<CDeterministicMNManager>& dmnman,
@@ -88,7 +87,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
     pblocktree.reset();
     pblocktree.reset(new CBlockTreeDB(nBlockTreeDBCache, block_tree_db_in_memory, fReset));
 
-    DashChainstateSetup(chainman, govman, mn_metaman, mn_sync, sporkman, mn_activeman, chain_helper, cpoolman,
+    DashChainstateSetup(chainman, govman, mn_metaman, mn_sync, sporkman, chain_helper, cpoolman,
                         dmnman, evodb, mnhf_manager, llmq_ctx, mempool, data_dir, dash_dbs_in_memory,
                         /*llmq_dbs_wipe=*/fReset || fReindexChainState, bls_threads, max_recsigs_age, consensus_params);
 
@@ -215,7 +214,6 @@ void DashChainstateSetup(ChainstateManager& chainman,
                          CMasternodeMetaMan& mn_metaman,
                          CMasternodeSync& mn_sync,
                          CSporkManager& sporkman,
-                         std::unique_ptr<CActiveMasternodeManager>& mn_activeman,
                          std::unique_ptr<CChainstateHelper>& chain_helper,
                          std::unique_ptr<CCreditPoolManager>& cpoolman,
                          std::unique_ptr<CDeterministicMNManager>& dmnman,
diff --git a/src/node/chainstate.h b/src/node/chainstate.h
@@ -11,7 +11,6 @@
 #include <optional>
 #include <string>
 
-class CActiveMasternodeManager;
 class CChainstateHelper;
 class CCreditPoolManager;
 class CDeterministicMNManager;
@@ -84,7 +83,6 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
                                                      CMasternodeMetaMan& mn_metaman,
                                                      CMasternodeSync& mn_sync,
                                                      CSporkManager& sporkman,
-                                                     std::unique_ptr<CActiveMasternodeManager>& mn_activeman,
                                                      std::unique_ptr<CChainstateHelper>& chain_helper,
                                                      std::unique_ptr<CCreditPoolManager>& cpoolman,
                                                      std::unique_ptr<CDeterministicMNManager>& dmnman,
@@ -116,7 +114,6 @@ void DashChainstateSetup(ChainstateManager& chainman,
                          CMasternodeMetaMan& mn_metaman,
                          CMasternodeSync& mn_sync,
                          CSporkManager& sporkman,
-                         std::unique_ptr<CActiveMasternodeManager>& mn_activeman,
                          std::unique_ptr<CChainstateHelper>& chain_helper,
                          std::unique_ptr<CCreditPoolManager>& cpoolman,
                          std::unique_ptr<CDeterministicMNManager>& dmnman,
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
@@ -145,7 +145,7 @@ void DashChainstateSetup(ChainstateManager& chainman,
                          const Consensus::Params& consensus_params)
 {
     DashChainstateSetup(chainman, *Assert(node.govman.get()), *Assert(node.mn_metaman.get()), *Assert(node.mn_sync.get()),
-                        *Assert(node.sporkman.get()), node.mn_activeman, node.chain_helper, node.cpoolman, node.dmnman,
+                        *Assert(node.sporkman.get()), node.chain_helper, node.cpoolman, node.dmnman,
                         node.evodb, node.mnhf_manager, node.llmq_ctx, Assert(node.mempool.get()), node.args->GetDataDirNet(),
                         llmq_dbs_in_memory, llmq_dbs_wipe, llmq::DEFAULT_BLSCHECK_THREADS, llmq::DEFAULT_MAX_RECOVERED_SIGS_AGE, consensus_params);
 }
@@ -324,7 +324,6 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
                                            *Assert(m_node.mn_metaman.get()),
                                            *Assert(m_node.mn_sync.get()),
                                            *Assert(m_node.sporkman.get()),
-                                           m_node.mn_activeman,
                                            m_node.chain_helper,
                                            m_node.cpoolman,
                                            m_node.dmnman,
