From effe81f7503d2ca3c88cfdea687f9f997f353e0d Mon Sep 17 00:00:00 2001 From: Ben Woosley Date: Thu, 7 Mar 2019 09:54:44 -0500 Subject: Move g_is_mempool_loaded into CTxMemPool::m_is_loaded So the loaded state is explicitly mempool-specific. --- src/validation.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/validation.h') diff --git a/src/validation.h b/src/validation.h index 4ef82ee2c7..0ff6c619b5 100644 --- a/src/validation.h +++ b/src/validation.h @@ -149,7 +149,6 @@ extern CScript COINBASE_FLAGS; extern CCriticalSection cs_main; extern CBlockPolicyEstimator feeEstimator; extern CTxMemPool mempool; -extern std::atomic_bool g_is_mempool_loaded; typedef std::unordered_map BlockMap; extern BlockMap& mapBlockIndex GUARDED_BY(cs_main); extern const std::string strMessageMagic; @@ -486,10 +485,10 @@ static const unsigned int REJECT_HIGHFEE = 0x100; CBlockFileInfo* GetBlockFileInfo(size_t n); /** Dump the mempool to disk. */ -bool DumpMempool(); +bool DumpMempool(const CTxMemPool& pool); /** Load the mempool from disk. */ -bool LoadMempool(); +bool LoadMempool(CTxMemPool& pool); //! Check whether the block associated with this index entry is pruned or not. inline bool IsBlockPruned(const CBlockIndex* pblockindex) -- cgit v1.2.3