phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-27 03:33:27 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bitcoin/bitcoin#30344: kernel: remove mempool_persist

Browse source 
f1478c0545 mempool: move LoadMempool/DumpMempool to node (Cory Fields)
6d242ff1e9 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 f1478c0545
  glozow:
    ACK f1478c0545
  stickies-v:
    ACK f1478c0545

Tree-SHA512: 5825da0cf2e67470524eb6ebe397eb90755a368469a25f184df99ab935b3eb6d89eb802b41a6c3661e869bba3bbfa8ba9d95281bc75ebbf790ec5d9d1f79c66f
This commit is contained in:
glozow 2024-07-02 10:04:43 +01:00
commit d2c8d161b4
No known key found for this signature in database
GPG key ID: BA03F4DBE0C63FB4
6 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Makefile.am
View file

@ -192,7 +192,6 @@ BITCOIN_CORE_H = \
kernel/mempool_entry.h \ kernel/mempool_entry.h \
kernel/mempool_limits.h \ kernel/mempool_limits.h \
kernel/mempool_options.h \ kernel/mempool_options.h \
kernel/mempool_persist.h \
kernel/mempool_removal_reason.h \ kernel/mempool_removal_reason.h \
kernel/messagestartchars.h \ kernel/messagestartchars.h \
kernel/notifications_interface.h \ kernel/notifications_interface.h \
@ -228,6 +227,7 @@ BITCOIN_CORE_H = \
node/interface_ui.h \ node/interface_ui.h \
node/kernel_notifications.h \ node/kernel_notifications.h \
node/mempool_args.h \ node/mempool_args.h \
node/mempool_persist.h \
node/mempool_persist_args.h \ node/mempool_persist_args.h \
node/miner.h \ node/miner.h \
node/mini_miner.h \ node/mini_miner.h \
@ -413,7 +413,6 @@ libbitcoin_node_a_SOURCES = \
kernel/context.cpp \ kernel/context.cpp \
kernel/cs_main.cpp \ kernel/cs_main.cpp \
kernel/disconnected_transactions.cpp \ kernel/disconnected_transactions.cpp \
kernel/mempool_persist.cpp \
kernel/mempool_removal_reason.cpp \ kernel/mempool_removal_reason.cpp \
mapport.cpp \ mapport.cpp \
net.cpp \ net.cpp \
@ -435,6 +434,7 @@ libbitcoin_node_a_SOURCES = \
node/interfaces.cpp \ node/interfaces.cpp \
node/kernel_notifications.cpp \ node/kernel_notifications.cpp \
node/mempool_args.cpp \ node/mempool_args.cpp \
node/mempool_persist.cpp \
node/mempool_persist_args.cpp \ node/mempool_persist_args.cpp \
node/miner.cpp \ node/miner.cpp \
node/mini_miner.cpp \ node/mini_miner.cpp \
@ -950,7 +950,6 @@ libbitcoinkernel_la_SOURCES = \
kernel/context.cpp \ kernel/context.cpp \
kernel/cs_main.cpp \ kernel/cs_main.cpp \
kernel/disconnected_transactions.cpp \ kernel/disconnected_transactions.cpp \
kernel/mempool_persist.cpp \
kernel/mempool_removal_reason.cpp \ kernel/mempool_removal_reason.cpp \
logging.cpp \ logging.cpp \
node/blockstorage.cpp \ node/blockstorage.cpp \

6
src/init.cpp
View file

@ -8,7 +8,6 @@
#include <init.h> #include <init.h>
#include <kernel/checks.h> #include <kernel/checks.h>
#include <kernel/mempool_persist.h>
#include <kernel/validation_cache_sizes.h> #include <kernel/validation_cache_sizes.h>
#include <addrman.h> #include <addrman.h>
@ -51,6 +50,7 @@
#include <node/interface_ui.h> #include <node/interface_ui.h>
#include <node/kernel_notifications.h> #include <node/kernel_notifications.h>
#include <node/mempool_args.h> #include <node/mempool_args.h>
#include <node/mempool_persist.h>
#include <node/mempool_persist_args.h> #include <node/mempool_persist_args.h>
#include <node/miner.h> #include <node/miner.h>
#include <node/peerman_args.h> #include <node/peerman_args.h>
@ -119,8 +119,6 @@
using common::AmountErrMsg; using common::AmountErrMsg;
using common::InvalidPortErrMsg; using common::InvalidPortErrMsg;
using common::ResolveErrMsg; using common::ResolveErrMsg;
using kernel::DumpMempool;
using kernel::LoadMempool;
using kernel::ValidationCacheSizes; using kernel::ValidationCacheSizes;
using node::ApplyArgsManOptions; using node::ApplyArgsManOptions;
@ -130,6 +128,8 @@ using node::CalculateCacheSizes;
using node::DEFAULT_PERSIST_MEMPOOL; using node::DEFAULT_PERSIST_MEMPOOL;
using node::DEFAULT_PRINTPRIORITY; using node::DEFAULT_PRINTPRIORITY;
using node::DEFAULT_STOPATHEIGHT; using node::DEFAULT_STOPATHEIGHT;
using node::DumpMempool;
using node::LoadMempool;
using node::KernelNotifications; using node::KernelNotifications;
using node::LoadChainstate; using node::LoadChainstate;
using node::MempoolPath; using node::MempoolPath;

6
src/kernel/mempool_persist.cpp → src/node/mempool_persist.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <kernel/mempool_persist.h> #include <node/mempool_persist.h>
#include <clientversion.h> #include <clientversion.h>
#include <consensus/amount.h> #include <consensus/amount.h>
@ -33,7 +33,7 @@
using fsbridge::FopenFn; using fsbridge::FopenFn;
namespace kernel { namespace node {
static const uint64_t MEMPOOL_DUMP_VERSION_NO_XOR_KEY{1}; static const uint64_t MEMPOOL_DUMP_VERSION_NO_XOR_KEY{1};
static const uint64_t MEMPOOL_DUMP_VERSION{2}; static const uint64_t MEMPOOL_DUMP_VERSION{2};
@ -218,4 +218,4 @@ bool DumpMempool(const CTxMemPool& pool, const fs::path& dump_path, FopenFn mock
return true; return true;
} }
} // namespace kernel } // namespace node

10
src/kernel/mempool_persist.h → src/node/mempool_persist.h
View file

@ -2,15 +2,15 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_KERNEL_MEMPOOL_PERSIST_H #ifndef BITCOIN_NODE_MEMPOOL_PERSIST_H
#define BITCOIN_KERNEL_MEMPOOL_PERSIST_H #define BITCOIN_NODE_MEMPOOL_PERSIST_H
#include <util/fs.h> #include <util/fs.h>
class Chainstate; class Chainstate;
class CTxMemPool; class CTxMemPool;
namespace kernel { namespace node {
/** Dump the mempool to a file. */ /** Dump the mempool to a file. */
bool DumpMempool(const CTxMemPool& pool, const fs::path& dump_path, bool DumpMempool(const CTxMemPool& pool, const fs::path& dump_path,
@ -28,7 +28,7 @@ bool LoadMempool(CTxMemPool& pool, const fs::path& load_path,
Chainstate& active_chainstate, Chainstate& active_chainstate,
ImportMempoolOptions&& opts); ImportMempoolOptions&& opts);
} // namespace kernel } // namespace node
#endif // BITCOIN_KERNEL_MEMPOOL_PERSIST_H #endif // BITCOIN_NODE_MEMPOOL_PERSIST_H

8
src/rpc/mempool.cpp
View file

@ -5,7 +5,7 @@
#include <rpc/blockchain.h> #include <rpc/blockchain.h>
#include <kernel/mempool_persist.h> #include <node/mempool_persist.h>
#include <chainparams.h> #include <chainparams.h>
#include <core_io.h> #include <core_io.h>
@ -27,7 +27,7 @@
#include <utility> #include <utility>
using kernel::DumpMempool; using node::DumpMempool;
using node::DEFAULT_MAX_BURN_AMOUNT; using node::DEFAULT_MAX_BURN_AMOUNT;
using node::DEFAULT_MAX_RAW_TX_FEE_RATE; using node::DEFAULT_MAX_RAW_TX_FEE_RATE;
@ -759,13 +759,13 @@ static RPCHelpMan importmempool()
const UniValue& use_current_time{request.params[1]["use_current_time"]}; const UniValue& use_current_time{request.params[1]["use_current_time"]};
const UniValue& apply_fee_delta{request.params[1]["apply_fee_delta_priority"]}; const UniValue& apply_fee_delta{request.params[1]["apply_fee_delta_priority"]};
const UniValue& apply_unbroadcast{request.params[1]["apply_unbroadcast_set"]}; const UniValue& apply_unbroadcast{request.params[1]["apply_unbroadcast_set"]};
kernel::ImportMempoolOptions opts{ node::ImportMempoolOptions opts{
.use_current_time = use_current_time.isNull() ? true : use_current_time.get_bool(), .use_current_time = use_current_time.isNull() ? true : use_current_time.get_bool(),
.apply_fee_delta_priority = apply_fee_delta.isNull() ? false : apply_fee_delta.get_bool(), .apply_fee_delta_priority = apply_fee_delta.isNull() ? false : apply_fee_delta.get_bool(),
.apply_unbroadcast_set = apply_unbroadcast.isNull() ? false : apply_unbroadcast.get_bool(), .apply_unbroadcast_set = apply_unbroadcast.isNull() ? false : apply_unbroadcast.get_bool(),
}; };
if (!kernel::LoadMempool(mempool, load_path, chainstate, std::move(opts))) { if (!node::LoadMempool(mempool, load_path, chainstate, std::move(opts))) {
throw JSONRPCError(RPC_MISC_ERROR, "Unable to import mempool file, see debug.log for details."); throw JSONRPCError(RPC_MISC_ERROR, "Unable to import mempool file, see debug.log for details.");
} }

6
src/test/fuzz/validation_load_mempool.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // 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_args.h>
#include <node/mempool_persist_args.h> #include <node/mempool_persist_args.h>
@ -21,8 +21,8 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
using kernel::DumpMempool; using node::DumpMempool;
using kernel::LoadMempool; using node::LoadMempool;
using node::MempoolPath; using node::MempoolPath;