From df09befb2fdda4ac26b22d2df486f592d568ce52 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Wed, 22 Sep 2021 11:32:25 +0200 Subject: [PATCH] Fix (inverse) meaning of -persistmempool Github-Pull: #23061 Rebased-From: faff17bbde6dcb1482a6210bc48b3192603a446f (cherry picked from commit db76db7329f6357c5226cd08611fe0f669c002af) --- src/init.cpp | 2 +- src/validation.cpp | 2 +- test/functional/mempool_persist.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 468d65147d..6f2032a8a3 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -227,7 +227,7 @@ void Shutdown(NodeContext& node) node.banman.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); } diff --git a/src/validation.cpp b/src/validation.cpp index c96515f3d7..9e219fdcbc 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -4229,7 +4229,7 @@ bool CChainState::LoadBlockIndexDB() void CChainState::LoadMempool(const ArgsManager& args) { if (!m_mempool) return; - if (args.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) { + if (args.GetBoolArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) { ::LoadMempool(*m_mempool, *this); } m_mempool->SetIsLoaded(!ShutdownRequested()); diff --git a/test/functional/mempool_persist.py b/test/functional/mempool_persist.py index d4b6cbf2cf..1ec0289ba3 100755 --- a/test/functional/mempool_persist.py +++ b/test/functional/mempool_persist.py @@ -141,7 +141,7 @@ class MempoolPersistTest(BitcoinTestFramework): self.log.debug("Stop nodes, make node1 use mempool.dat from node0. Verify it has 6 transactions") os.rename(mempooldat0, mempooldat1) self.stop_nodes() - self.start_node(1, extra_args=[]) + self.start_node(1, extra_args=["-persistmempool"]) assert self.nodes[1].getmempoolinfo()["loaded"] assert_equal(len(self.nodes[1].getrawmempool()), 6)