Skip to content

Commit 14f5ce4

Browse files
committed
refactor: remove usages of CMasternodeSync from chainstate
1 parent cb54afd commit 14f5ce4

4 files changed

Lines changed: 2 additions & 9 deletions

File tree

src/init.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1992,7 +1992,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
19921992
chainman,
19931993
*node.govman,
19941994
*node.mn_metaman,
1995-
*node.mn_sync,
19961995
*node.sporkman,
19971996
*node.chainlocks,
19981997
node.chain_helper,

src/node/chainstate.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
3737
ChainstateManager& chainman,
3838
CGovernanceManager& govman,
3939
CMasternodeMetaMan& mn_metaman,
40-
CMasternodeSync& mn_sync,
4140
CSporkManager& sporkman,
4241
chainlock::Chainlocks& chainlocks,
4342
std::unique_ptr<CChainstateHelper>& chain_helper,
@@ -83,7 +82,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
8382
pblocktree.reset();
8483
pblocktree.reset(new CBlockTreeDB(nBlockTreeDBCache, block_tree_db_in_memory, fReset));
8584

86-
DashChainstateSetup(chainman, govman, mn_metaman, mn_sync, sporkman, chainlocks, chain_helper,
85+
DashChainstateSetup(chainman, govman, mn_metaman, sporkman, chainlocks, chain_helper,
8786
dmnman, *evodb, llmq_ctx, mempool, data_dir, dash_dbs_in_memory,
8887
/*llmq_dbs_wipe=*/fReset || fReindexChainState, bls_threads, worker_count,
8988
max_recsigs_age, consensus_params);
@@ -209,7 +208,6 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
209208
void DashChainstateSetup(ChainstateManager& chainman,
210209
CGovernanceManager& govman,
211210
CMasternodeMetaMan& mn_metaman,
212-
CMasternodeSync& mn_sync,
213211
CSporkManager& sporkman,
214212
chainlock::Chainlocks& chainlocks,
215213
std::unique_ptr<CChainstateHelper>& chain_helper,

src/node/chainstate.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class CEvoDB;
1717
class CGovernanceManager;
1818
class ChainstateManager;
1919
class CMasternodeMetaMan;
20-
class CMasternodeSync;
2120
class CSporkManager;
2221
class CTxMemPool;
2322
struct LLMQContext;
@@ -80,7 +79,6 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
8079
ChainstateManager& chainman,
8180
CGovernanceManager& govman,
8281
CMasternodeMetaMan& mn_metaman,
83-
CMasternodeSync& mn_sync,
8482
CSporkManager& sporkman,
8583
chainlock::Chainlocks& chainlocks,
8684
std::unique_ptr<CChainstateHelper>& chain_helper,
@@ -111,7 +109,6 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
111109
void DashChainstateSetup(ChainstateManager& chainman,
112110
CGovernanceManager& govman,
113111
CMasternodeMetaMan& mn_metaman,
114-
CMasternodeSync& mn_sync,
115112
CSporkManager& sporkman,
116113
chainlock::Chainlocks& chainlocks,
117114
std::unique_ptr<CChainstateHelper>& chain_helper,

src/test/util/setup_common.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ void DashChainstateSetup(ChainstateManager& chainman,
143143
bool llmq_dbs_wipe,
144144
const Consensus::Params& consensus_params)
145145
{
146-
DashChainstateSetup(chainman, *Assert(node.govman.get()), *Assert(node.mn_metaman.get()), *Assert(node.mn_sync.get()),
146+
DashChainstateSetup(chainman, *Assert(node.govman.get()), *Assert(node.mn_metaman.get()),
147147
*Assert(node.sporkman.get()), *Assert(node.chainlocks), node.chain_helper, node.dmnman, *node.evodb,
148148
node.llmq_ctx, Assert(node.mempool.get()), node.args->GetDataDirNet(), llmq_dbs_in_memory, llmq_dbs_wipe,
149149
llmq::DEFAULT_BLSCHECK_THREADS, llmq::DEFAULT_WORKER_COUNT, llmq::DEFAULT_MAX_RECOVERED_SIGS_AGE,
@@ -323,7 +323,6 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
323323
*Assert(m_node.chainman.get()),
324324
*Assert(m_node.govman.get()),
325325
*Assert(m_node.mn_metaman.get()),
326-
*Assert(m_node.mn_sync.get()),
327326
*Assert(m_node.sporkman.get()),
328327
*Assert(m_node.chainlocks.get()),
329328
m_node.chain_helper,

0 commit comments

Comments
 (0)