diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-04-18 08:27:46 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-05-21 09:55:59 -0400 |
| commit | fa84b1cd846f6499b741710fd478ec9ad49b5120 (patch) | |
| tree | ba6d89958fe86a9e24614875bc73d7205011c8c7 /src/validation.cpp | |
| parent | fa05fdf0f19fa4b557cc5e9ba436e3215b83c4e6 (diff) | |
validation: Make LoadBlockIndex() a member of ChainstateManager
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index a9dfa5c171..830bb80732 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -4154,9 +4154,9 @@ void BlockManager::Unload() { m_block_index.clear(); } -bool static LoadBlockIndexDB(const CChainParams& chainparams) EXCLUSIVE_LOCKS_REQUIRED(cs_main) +bool static LoadBlockIndexDB(ChainstateManager& chainman, const CChainParams& chainparams) EXCLUSIVE_LOCKS_REQUIRED(cs_main) { - if (!g_chainman.m_blockman.LoadBlockIndex( + if (!chainman.m_blockman.LoadBlockIndex( chainparams.GetConsensus(), *pblocktree, ::ChainstateActive().setBlockIndexCandidates)) { return false; @@ -4182,8 +4182,7 @@ bool static LoadBlockIndexDB(const CChainParams& chainparams) EXCLUSIVE_LOCKS_RE // Check presence of blk files LogPrintf("Checking all blk files are present...\n"); std::set<int> setBlkDataFiles; - for (const std::pair<const uint256, CBlockIndex*>& item : g_chainman.BlockIndex()) - { + for (const std::pair<const uint256, CBlockIndex*>& item : chainman.BlockIndex()) { CBlockIndex* pindex = item.second; if (pindex->nStatus & BLOCK_HAVE_DATA) { setBlkDataFiles.insert(pindex->nFile); @@ -4600,14 +4599,15 @@ void UnloadBlockIndex() fHavePruned = false; } -bool LoadBlockIndex(const CChainParams& chainparams) +bool ChainstateManager::LoadBlockIndex(const CChainParams& chainparams) { + AssertLockHeld(cs_main); // Load block index from databases bool needs_init = fReindex; if (!fReindex) { - bool ret = LoadBlockIndexDB(chainparams); + bool ret = LoadBlockIndexDB(*this, chainparams); if (!ret) return false; - needs_init = g_chainman.m_blockman.m_block_index.empty(); + needs_init = m_blockman.m_block_index.empty(); } if (needs_init) { |