phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix (inverse) meaning of -persistmempool

Browse source
This commit is contained in:
MarcoFalke 2021-09-22 11:32:25 +02:00
parent 51c7d88e67
commit faff17bbde
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/init.cpp
View file

@ -218,7 +218,7 @@ void Shutdown(NodeContext& node)
node.banman.reset(); node.banman.reset();
node.addrman.reset(); node.addrman.reset();
if (node.mempool && node.mempool->IsLoaded() && node.args->GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) { if (node.mempool && node.mempool->IsLoaded() && node.args->GetBoolArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {
DumpMempool(*node.mempool); DumpMempool(*node.mempool);
} }

2
src/validation.cpp
View file

@ -3703,7 +3703,7 @@ bool BlockManager::LoadBlockIndexDB(std::set<CBlockIndex*, CBlockIndexWorkCompar
void CChainState::LoadMempool(const ArgsManager& args) void CChainState::LoadMempool(const ArgsManager& args)
{ {
if (!m_mempool) return; if (!m_mempool) return;
if (args.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) { if (args.GetBoolArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {
::LoadMempool(*m_mempool, *this); ::LoadMempool(*m_mempool, *this);
} }
m_mempool->SetIsLoaded(!ShutdownRequested()); m_mempool->SetIsLoaded(!ShutdownRequested());

2
test/functional/mempool_persist.py
View file

@ -141,7 +141,7 @@ class MempoolPersistTest(BitcoinTestFramework):
self.log.debug("Stop nodes, make node1 use mempool.dat from node0. Verify it has 6 transactions") self.log.debug("Stop nodes, make node1 use mempool.dat from node0. Verify it has 6 transactions")
os.rename(mempooldat0, mempooldat1) os.rename(mempooldat0, mempooldat1)
self.stop_nodes() self.stop_nodes()
self.start_node(1, extra_args=[]) self.start_node(1, extra_args=["-persistmempool"])
assert self.nodes[1].getmempoolinfo()["loaded"] assert self.nodes[1].getmempoolinfo()["loaded"]
assert_equal(len(self.nodes[1].getrawmempool()), 6) assert_equal(len(self.nodes[1].getrawmempool()), 6)