diff options
| author | glozow <gloriajzhao@gmail.com> | 2024-07-02 10:04:43 +0100 |
|---|---|---|
| committer | glozow <gloriajzhao@gmail.com> | 2024-07-02 10:25:25 +0100 |
| commit | d2c8d161b46bd62256a17abd086d8ae138c043c3 (patch) | |
| tree | c049a3ebf3d1ae582b10faeeb03635fd53cba3a8 /src/test/fuzz | |
| parent | 04d63fb8c393bc85b50a72e2b7b08bed70fbc822 (diff) | |
| parent | f1478c05458562a9bef5c2ba43959d758e7b4745 (diff) | |
Merge bitcoin/bitcoin#30344: kernel: remove mempool_persist
f1478c05458562a9bef5c2ba43959d758e7b4745 mempool: move LoadMempool/DumpMempool to node (Cory Fields)
6d242ff1e9ca02fd8f5cb3ffe82dfb48a52366cc kernel: remove mempool_persist.cpp (Cory Fields)
Pull request description:
DumpMempool/LoadMempool are not necessary for the kernel.
Noticed while working on instantiated logging.
I suppose these could have been left in on purpose, but I'm assuming it was probably just an oversight.
ACKs for top commit:
TheCharlatan:
Re-ACK f1478c05458562a9bef5c2ba43959d758e7b4745
glozow:
ACK f1478c0545
stickies-v:
ACK f1478c05458562a9bef5c2ba43959d758e7b4745
Tree-SHA512: 5825da0cf2e67470524eb6ebe397eb90755a368469a25f184df99ab935b3eb6d89eb802b41a6c3661e869bba3bbfa8ba9d95281bc75ebbf790ec5d9d1f79c66f
Diffstat (limited to 'src/test/fuzz')
| -rw-r--r-- | src/test/fuzz/validation_load_mempool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/fuzz/validation_load_mempool.cpp b/src/test/fuzz/validation_load_mempool.cpp index 51140ae039..c70d9ddf1e 100644 --- a/src/test/fuzz/validation_load_mempool.cpp +++ b/src/test/fuzz/validation_load_mempool.cpp @@ -2,7 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include <kernel/mempool_persist.h> +#include <node/mempool_persist.h> #include <node/mempool_args.h> #include <node/mempool_persist_args.h> @@ -21,8 +21,8 @@ #include <cstdint> #include <vector> -using kernel::DumpMempool; -using kernel::LoadMempool; +using node::DumpMempool; +using node::LoadMempool; using node::MempoolPath; |