diff options
author | Carl Dong <contact@carldong.me> | 2022-07-12 15:54:11 -0400 |
---|---|---|
committer | Carl Dong <contact@carldong.me> | 2022-07-15 11:30:50 -0400 |
commit | 413f4bb52b72e082ad8716664ede48352b8e7e5a (patch) | |
tree | 0693604f576339340584525094aebfc7efbb41b2 /src/validation.cpp | |
parent | bd4407817e523e3c5b347bc6be25ed007cb27034 (diff) | |
download | bitcoin-413f4bb52b72e082ad8716664ede48352b8e7e5a.tar.xz |
DumpMempool: Pass in dump_path, stop using gArgs
Also introduce node::{ShouldPersistMempool,MempoolPath} helper functions
in node/mempool_persist_args.{h,cpp} which are used by non-kernel
DumpMempool callers to determine whether or not to automatically dump
the mempool and where to dump it to.
Diffstat (limited to 'src/validation.cpp')
-rw-r--r-- | src/validation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index 48535d32a9..4d02fbef53 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -4726,7 +4726,7 @@ bool LoadMempool(CTxMemPool& pool, CChainState& active_chainstate, FopenFn mocka return true; } -bool DumpMempool(const CTxMemPool& pool, FopenFn mockable_fopen_function, bool skip_file_commit) +bool DumpMempool(const CTxMemPool& pool, const fs::path& dump_path, FopenFn mockable_fopen_function, bool skip_file_commit) { auto start = SteadyClock::now(); @@ -4749,7 +4749,7 @@ bool DumpMempool(const CTxMemPool& pool, FopenFn mockable_fopen_function, bool s auto mid = SteadyClock::now(); try { - FILE* filestr{mockable_fopen_function(gArgs.GetDataDirNet() / "mempool.dat.new", "wb")}; + FILE* filestr{mockable_fopen_function(dump_path + ".new", "wb")}; if (!filestr) { return false; } @@ -4775,7 +4775,7 @@ bool DumpMempool(const CTxMemPool& pool, FopenFn mockable_fopen_function, bool s if (!skip_file_commit && !FileCommit(file.Get())) throw std::runtime_error("FileCommit failed"); file.fclose(); - if (!RenameOver(gArgs.GetDataDirNet() / "mempool.dat.new", gArgs.GetDataDirNet() / "mempool.dat")) { + if (!RenameOver(dump_path + ".new", dump_path)) { throw std::runtime_error("Rename failed"); } auto last = SteadyClock::now(); |