diff options
| author | James O'Beirne <james.obeirne@gmail.com> | 2019-06-24 15:22:33 -0400 |
|---|---|---|
| committer | James O'Beirne <james.obeirne@gmail.com> | 2019-07-08 11:33:12 -0400 |
| commit | 4ed55dfcd7894fd5ba6395f244a17ab1f8e786d4 (patch) | |
| tree | 08cf711fb536abef170886660f3d5fa6ffd0592d /src | |
| parent | 613c46fe9e39f55b0f0daa18fee20b4120db2539 (diff) | |
refactoring: add block_index_candidates arg to LoadBlockIndex
Prevents BlockManager from having to reference ChainstateActive()
within one of its methods which improves encapsulation and makes
testing easier.
Diffstat (limited to 'src')
| -rw-r--r-- | src/validation.cpp | 13 | ||||
| -rw-r--r-- | src/validation.h | 12 |
2 files changed, 20 insertions, 5 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index 75d5bb9fe6..3e71928d17 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -3705,7 +3705,10 @@ CBlockIndex * BlockManager::InsertBlockIndex(const uint256& hash) return pindexNew; } -bool BlockManager::LoadBlockIndex(const Consensus::Params& consensus_params, CBlockTreeDB& blocktree) +bool BlockManager::LoadBlockIndex( + const Consensus::Params& consensus_params, + CBlockTreeDB& blocktree, + std::set<CBlockIndex*, CBlockIndexWorkComparator>& block_index_candidates) { if (!blocktree.LoadBlockIndexGuts(consensus_params, [this](const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main) { return this->InsertBlockIndex(hash); })) return false; @@ -3743,8 +3746,9 @@ bool BlockManager::LoadBlockIndex(const Consensus::Params& consensus_params, CBl pindex->nStatus |= BLOCK_FAILED_CHILD; setDirtyBlockIndex.insert(pindex); } - if (pindex->IsValid(BLOCK_VALID_TRANSACTIONS) && (pindex->HaveTxsDownloaded() || pindex->pprev == nullptr)) - ::ChainstateActive().setBlockIndexCandidates.insert(pindex); + if (pindex->IsValid(BLOCK_VALID_TRANSACTIONS) && (pindex->HaveTxsDownloaded() || pindex->pprev == nullptr)) { + block_index_candidates.insert(pindex); + } if (pindex->nStatus & BLOCK_FAILED_MASK && (!pindexBestInvalid || pindex->nChainWork > pindexBestInvalid->nChainWork)) pindexBestInvalid = pindex; if (pindex->pprev) @@ -3769,7 +3773,8 @@ void BlockManager::Unload() { bool static LoadBlockIndexDB(const CChainParams& chainparams) EXCLUSIVE_LOCKS_REQUIRED(cs_main) { - if (!g_blockman.LoadBlockIndex(chainparams.GetConsensus(), *pblocktree)) + if (!g_blockman.LoadBlockIndex( + chainparams.GetConsensus(), *pblocktree, ::ChainstateActive().setBlockIndexCandidates)) return false; // Load block file info diff --git a/src/validation.h b/src/validation.h index 09afbf7b10..ab18f662a4 100644 --- a/src/validation.h +++ b/src/validation.h @@ -475,9 +475,19 @@ public: */ std::multimap<CBlockIndex*, CBlockIndex*> m_blocks_unlinked; + /** + * Load the blocktree off disk and into memory. Populate certain metadata + * per index entry (nStatus, nChainWork, nTimeMax, etc.) as well as peripheral + * collections like setDirtyBlockIndex. + * + * @param[out] block_index_candidates Fill this set with any valid blocks for + * which we've downloaded all transactions. + */ bool LoadBlockIndex( const Consensus::Params& consensus_params, - CBlockTreeDB& blocktree) EXCLUSIVE_LOCKS_REQUIRED(cs_main); + CBlockTreeDB& blocktree, + std::set<CBlockIndex*, CBlockIndexWorkComparator>& block_index_candidates) + EXCLUSIVE_LOCKS_REQUIRED(cs_main); /** Clear all data members. */ void Unload() EXCLUSIVE_LOCKS_REQUIRED(cs_main); |