mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 15:04:44 +01:00
Code Issues Projects Releases Wiki Activity

validation: Make CChainState.m_blockman public

Browse source
This commit is contained in:
Carl Dong 2020-09-02 16:05:54 -04:00
parent d363d06bf7
commit 0e17c833cd
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/validation.cpp
View file

@ -1264,8 +1264,8 @@ void CoinsViews::InitCache()
} }
CChainState::CChainState(CTxMemPool& mempool, BlockManager& blockman, uint256 from_snapshot_blockhash) CChainState::CChainState(CTxMemPool& mempool, BlockManager& blockman, uint256 from_snapshot_blockhash)
: m_blockman(blockman), : m_mempool(mempool),
m_mempool(mempool), m_blockman(blockman),
m_from_snapshot_blockhash(from_snapshot_blockhash) {} m_from_snapshot_blockhash(from_snapshot_blockhash) {}
void CChainState::InitCoinsDB( void CChainState::InitCoinsDB(

9
src/validation.h
View file

@ -536,11 +536,6 @@ protected:
*/ */
mutable std::atomic<bool> m_cached_finished_ibd{false}; mutable std::atomic<bool> m_cached_finished_ibd{false};
//! Reference to a BlockManager instance which itself is shared across all
//! CChainState instances. Keeping a local reference allows us to test more
//! easily as opposed to referencing a global.
BlockManager& m_blockman;
//! mempool that is kept in sync with the chain //! mempool that is kept in sync with the chain
CTxMemPool& m_mempool; CTxMemPool& m_mempool;
@ -548,6 +543,10 @@ protected:
std::unique_ptr<CoinsViews> m_coins_views; std::unique_ptr<CoinsViews> m_coins_views;
public: public:
//! Reference to a BlockManager instance which itself is shared across all
//! CChainState instances.
BlockManager& m_blockman;
explicit CChainState(CTxMemPool& mempool, BlockManager& blockman, uint256 from_snapshot_blockhash = uint256()); explicit CChainState(CTxMemPool& mempool, BlockManager& blockman, uint256 from_snapshot_blockhash = uint256());
/** /**