highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-22 13:40:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

validation: Make LoadBlockIndex() a member of ChainstateManager

Browse Source
This commit is contained in:
MarcoFalke
2020-04-18 08:27:46 -04:00
parent fa05fdf0f1
commit fa84b1cd84
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/validation.cpp
View File

@@ -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) {