foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-15 11:36:00 -05:00
Code Issues Activity

kernel: pass params to BlockManager rather than using a global

Browse source
This commit is contained in:
Cory Fields 2022-06-01 19:10:10 +00:00
parent 1c7ef0abd1
commit a4741bd8d4
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/node/blockstorage.cpp
View file

@ -318,9 +318,9 @@ bool BlockManager::WriteBlockIndexDB()
return true; return true;
} }
bool BlockManager::LoadBlockIndexDB() bool BlockManager::LoadBlockIndexDB(const Consensus::Params& consensus_params)
{ {
if (!LoadBlockIndex(::Params().GetConsensus())) { if (!LoadBlockIndex(consensus_params)) {
return false; return false;
} }

2
src/node/blockstorage.h
View file

@ -153,7 +153,7 @@ public:
std::unique_ptr<CBlockTreeDB> m_block_tree_db GUARDED_BY(::cs_main); std::unique_ptr<CBlockTreeDB> m_block_tree_db GUARDED_BY(::cs_main);
bool WriteBlockIndexDB() EXCLUSIVE_LOCKS_REQUIRED(::cs_main); bool WriteBlockIndexDB() EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
bool LoadBlockIndexDB() EXCLUSIVE_LOCKS_REQUIRED(::cs_main); bool LoadBlockIndexDB(const Consensus::Params& consensus_params) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
CBlockIndex* AddToBlockIndex(const CBlockHeader& block, CBlockIndex*& best_header) EXCLUSIVE_LOCKS_REQUIRED(cs_main); CBlockIndex* AddToBlockIndex(const CBlockHeader& block, CBlockIndex*& best_header) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
/** Create a new block index entry for a given block hash */ /** Create a new block index entry for a given block hash */

2
src/validation.cpp
View file

@ -4158,7 +4158,7 @@ bool ChainstateManager::LoadBlockIndex()
// Load block index from databases // Load block index from databases
bool needs_init = fReindex; bool needs_init = fReindex;
if (!fReindex) { if (!fReindex) {
bool ret = m_blockman.LoadBlockIndexDB(); bool ret = m_blockman.LoadBlockIndexDB(GetConsensus());
if (!ret) return false; if (!ret) return false;
std::vector<CBlockIndex*> vSortedByHeight{m_blockman.GetAllBlockIndices()}; std::vector<CBlockIndex*> vSortedByHeight{m_blockman.GetAllBlockIndices()};