Skip to content

Commit 004b3b7

Browse files
kwvgkwvg
committed
refactor: drop CActiveMasternodeManager from chainstate init
1 parent 01c0b94 commit 004b3b7

File tree

6 files changed

+9
-15
lines changed

6 files changed

+9
-15
lines changed

‎src/init.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2012,7 +2012,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
20122012
*node.mn_metaman,
20132013
*node.mn_sync,
20142014
*node.sporkman,
2015-
node.mn_activeman,
20162015
node.chain_helper,
20172016
node.cpoolman,
20182017
node.dmnman,

‎src/llmq/context.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#include <llmq/snapshot.h>
1414
#include <validation.h>
1515

16-
LLMQContext::LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CEvoDB& evo_db,
17-
CSporkManager& sporkman, CTxMemPool& mempool, const CMasternodeSync& mn_sync,
16+
LLMQContext::LLMQContext(CDeterministicMNManager& dmnman, CEvoDB& evo_db, CSporkManager& sporkman, CTxMemPool& mempool,
17+
const ChainstateManager& chainman, const CMasternodeSync& mn_sync,
1818
const util::DbWrapperParams& db_params, int8_t bls_threads, int64_t max_recsigs_age) :
1919
bls_worker{std::make_shared<CBLSWorker>()},
2020
qsnapman{std::make_unique<llmq::CQuorumSnapshotManager>(evo_db)},

‎src/llmq/context.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ struct LLMQContext {
3636
LLMQContext() = delete;
3737
LLMQContext(const LLMQContext&) = delete;
3838
LLMQContext& operator=(const LLMQContext&) = delete;
39-
explicit LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CEvoDB& evo_db,
40-
CSporkManager& sporkman, CTxMemPool& mempool, const CMasternodeSync& mn_sync,
39+
explicit LLMQContext(CDeterministicMNManager& dmnman, CEvoDB& evo_db, CSporkManager& sporkman, CTxMemPool& mempool,
40+
const ChainstateManager& chainman, const CMasternodeSync& mn_sync,
4141
const util::DbWrapperParams& db_params, int8_t bls_threads, int64_t max_recsigs_age);
4242
~LLMQContext();
4343

‎src/node/chainstate.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
4040
CMasternodeMetaMan& mn_metaman,
4141
CMasternodeSync& mn_sync,
4242
CSporkManager& sporkman,
43-
std::unique_ptr<CActiveMasternodeManager>& mn_activeman,
4443
std::unique_ptr<CChainstateHelper>& chain_helper,
4544
std::unique_ptr<CCreditPoolManager>& cpoolman,
4645
std::unique_ptr<CDeterministicMNManager>& dmnman,
@@ -88,7 +87,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
8887
pblocktree.reset();
8988
pblocktree.reset(new CBlockTreeDB(nBlockTreeDBCache, block_tree_db_in_memory, fReset));
9089

91-
DashChainstateSetup(chainman, govman, mn_metaman, mn_sync, sporkman, mn_activeman, chain_helper, cpoolman,
90+
DashChainstateSetup(chainman, govman, mn_metaman, mn_sync, sporkman, chain_helper, cpoolman,
9291
dmnman, evodb, mnhf_manager, llmq_ctx, mempool, data_dir, dash_dbs_in_memory,
9392
/*llmq_dbs_wipe=*/fReset || fReindexChainState, bls_threads, max_recsigs_age, consensus_params);
9493

@@ -215,7 +214,6 @@ void DashChainstateSetup(ChainstateManager& chainman,
215214
CMasternodeMetaMan& mn_metaman,
216215
CMasternodeSync& mn_sync,
217216
CSporkManager& sporkman,
218-
std::unique_ptr<CActiveMasternodeManager>& mn_activeman,
219217
std::unique_ptr<CChainstateHelper>& chain_helper,
220218
std::unique_ptr<CCreditPoolManager>& cpoolman,
221219
std::unique_ptr<CDeterministicMNManager>& dmnman,
@@ -241,7 +239,7 @@ void DashChainstateSetup(ChainstateManager& chainman,
241239
llmq_ctx->Stop();
242240
}
243241
llmq_ctx.reset();
244-
llmq_ctx = std::make_unique<LLMQContext>(chainman, *dmnman, *evodb, sporkman, *mempool, mn_sync,
242+
llmq_ctx = std::make_unique<LLMQContext>(*dmnman, *evodb, sporkman, *mempool, chainman, mn_sync,
245243
util::DbWrapperParams{.path = data_dir, .memory = llmq_dbs_in_memory, .wipe = llmq_dbs_wipe},
246244
bls_threads, max_recsigs_age);
247245
mempool->ConnectManagers(dmnman.get(), llmq_ctx->isman.get());

‎src/node/chainstate.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
8484
CMasternodeMetaMan& mn_metaman,
8585
CMasternodeSync& mn_sync,
8686
CSporkManager& sporkman,
87-
std::unique_ptr<CActiveMasternodeManager>& mn_activeman,
8887
std::unique_ptr<CChainstateHelper>& chain_helper,
8988
std::unique_ptr<CCreditPoolManager>& cpoolman,
9089
std::unique_ptr<CDeterministicMNManager>& dmnman,
@@ -116,7 +115,6 @@ void DashChainstateSetup(ChainstateManager& chainman,
116115
CMasternodeMetaMan& mn_metaman,
117116
CMasternodeSync& mn_sync,
118117
CSporkManager& sporkman,
119-
std::unique_ptr<CActiveMasternodeManager>& mn_activeman,
120118
std::unique_ptr<CChainstateHelper>& chain_helper,
121119
std::unique_ptr<CCreditPoolManager>& cpoolman,
122120
std::unique_ptr<CDeterministicMNManager>& dmnman,

‎src/test/util/setup_common.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ void DashChainstateSetup(ChainstateManager& chainman,
145145
const Consensus::Params& consensus_params)
146146
{
147147
DashChainstateSetup(chainman, *Assert(node.govman.get()), *Assert(node.mn_metaman.get()), *Assert(node.mn_sync.get()),
148-
*Assert(node.sporkman.get()), node.mn_activeman, node.chain_helper, node.cpoolman, node.dmnman,
149-
node.evodb, node.mnhf_manager, node.llmq_ctx, Assert(node.mempool.get()), node.args->GetDataDirNet(),
150-
llmq_dbs_in_memory, llmq_dbs_wipe, llmq::DEFAULT_BLSCHECK_THREADS, llmq::DEFAULT_MAX_RECOVERED_SIGS_AGE, consensus_params);
148+
*Assert(node.sporkman.get()), node.chain_helper, node.cpoolman, node.dmnman, node.evodb, node.mnhf_manager,
149+
node.llmq_ctx, Assert(node.mempool.get()), node.args->GetDataDirNet(), llmq_dbs_in_memory, llmq_dbs_wipe,
150+
llmq::DEFAULT_BLSCHECK_THREADS, llmq::DEFAULT_MAX_RECOVERED_SIGS_AGE, consensus_params);
151151
}
152152

153153
void DashChainstateSetupClose(NodeContext& node)
@@ -324,7 +324,6 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
324324
*Assert(m_node.mn_metaman.get()),
325325
*Assert(m_node.mn_sync.get()),
326326
*Assert(m_node.sporkman.get()),
327-
m_node.mn_activeman,
328327
m_node.chain_helper,
329328
m_node.cpoolman,
330329
m_node.dmnman,

0 commit comments

Comments
 (0)