diff options
author | Ben Woosley <ben.woosley@gmail.com> | 2019-03-07 09:54:44 -0500 |
---|---|---|
committer | Ben Woosley <ben.woosley@gmail.com> | 2019-03-22 02:31:25 -0700 |
commit | effe81f7503d2ca3c88cfdea687f9f997f353e0d (patch) | |
tree | ede6c685bd0d9e24fd58aab6d4faa69baa69781f /src/init.cpp | |
parent | bb8ae2c41941d0776968f75cec0de89247e952dc (diff) | |
download | bitcoin-effe81f7503d2ca3c88cfdea687f9f997f353e0d.tar.xz |
Move g_is_mempool_loaded into CTxMemPool::m_is_loaded
So the loaded state is explicitly mempool-specific.
Diffstat (limited to 'src/init.cpp')
-rw-r--r-- | src/init.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp index ee9a451d0b..cf3be0556e 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -235,8 +235,8 @@ void Shutdown(InitInterfaces& interfaces) g_banman.reset(); g_txindex.reset(); - if (g_is_mempool_loaded && gArgs.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) { - DumpMempool(); + if (::mempool.IsLoaded() && gArgs.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) { + DumpMempool(::mempool); } if (fFeeEstimatesInitialized) @@ -725,9 +725,9 @@ static void ThreadImport(std::vector<fs::path> vImportFiles) } } // End scope of CImportingNow if (gArgs.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) { - LoadMempool(); + LoadMempool(::mempool); } - g_is_mempool_loaded = !ShutdownRequested(); + ::mempool.SetIsLoaded(!ShutdownRequested()); } /** Sanity checks |