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/Makefile.am | |
| parent | 04d63fb8c393bc85b50a72e2b7b08bed70fbc822 (diff) | |
| parent | f1478c05458562a9bef5c2ba43959d758e7b4745 (diff) | |
| download | bitcoin-d2c8d161b46bd62256a17abd086d8ae138c043c3.tar.xz | |
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/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0c47a737d0..52d4aae893 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -192,7 +192,6 @@ BITCOIN_CORE_H = \ kernel/mempool_entry.h \ kernel/mempool_limits.h \ kernel/mempool_options.h \ - kernel/mempool_persist.h \ kernel/mempool_removal_reason.h \ kernel/messagestartchars.h \ kernel/notifications_interface.h \ @@ -228,6 +227,7 @@ BITCOIN_CORE_H = \ node/interface_ui.h \ node/kernel_notifications.h \ node/mempool_args.h \ + node/mempool_persist.h \ node/mempool_persist_args.h \ node/miner.h \ node/mini_miner.h \ @@ -413,7 +413,6 @@ libbitcoin_node_a_SOURCES = \ kernel/context.cpp \ kernel/cs_main.cpp \ kernel/disconnected_transactions.cpp \ - kernel/mempool_persist.cpp \ kernel/mempool_removal_reason.cpp \ mapport.cpp \ net.cpp \ @@ -435,6 +434,7 @@ libbitcoin_node_a_SOURCES = \ node/interfaces.cpp \ node/kernel_notifications.cpp \ node/mempool_args.cpp \ + node/mempool_persist.cpp \ node/mempool_persist_args.cpp \ node/miner.cpp \ node/mini_miner.cpp \ @@ -950,7 +950,6 @@ libbitcoinkernel_la_SOURCES = \ kernel/context.cpp \ kernel/cs_main.cpp \ kernel/disconnected_transactions.cpp \ - kernel/mempool_persist.cpp \ kernel/mempool_removal_reason.cpp \ logging.cpp \ node/blockstorage.cpp \ |