From fac812ca835e0d843aba1d4db0e49d183018a29e Mon Sep 17 00:00:00 2001 From: MacroFake Date: Tue, 2 Aug 2022 15:30:00 +0200 Subject: [PATCH] scripted-diff: Move mempool_args to src/node It is part of the node library. Also, it won't be moved to the kernel lib, as it will be pruned of ArgsManager. -BEGIN VERIFY SCRIPT- # Move module git mv src/mempool_args.cpp src/node/ git mv src/mempool_args.h src/node/ # Replacements sed -i 's:mempool_args\.h:node/mempool_args.h:g' $(git grep -l mempool_args) sed -i 's:mempool_args\.cpp:node/mempool_args.cpp:g' $(git grep -l mempool_args) sed -i 's:MEMPOOL_ARGS_H:NODE_MEMPOOL_ARGS_H:g' $(git grep -l MEMPOOL_ARGS_H) -END VERIFY SCRIPT- --- ci/test/06_script_b.sh | 2 +- src/Makefile.am | 4 ++-- src/init.cpp | 2 +- src/{ => node}/mempool_args.cpp | 2 +- src/{ => node}/mempool_args.h | 6 +++--- src/test/fuzz/rbf.cpp | 2 +- src/test/fuzz/tx_pool.cpp | 2 +- src/test/fuzz/validation_load_mempool.cpp | 2 +- src/test/util/setup_common.cpp | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) rename src/{ => node}/mempool_args.cpp (99%) rename src/{ => node}/mempool_args.h (87%) diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh index 978830b7e2b..0d8d860f1be 100755 --- a/ci/test/06_script_b.sh +++ b/ci/test/06_script_b.sh @@ -44,7 +44,7 @@ if [ "${RUN_TIDY}" = "true" ]; then " src/dbwrapper.cpp"\ " src/init"\ " src/kernel"\ - " src/mempool_args.cpp"\ + " src/node/mempool_args.cpp"\ " src/node/chainstate.cpp"\ " src/policy/feerate.cpp"\ " src/policy/packages.cpp"\ diff --git a/src/Makefile.am b/src/Makefile.am index 23bc1800953..1da61991374 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -184,7 +184,7 @@ BITCOIN_CORE_H = \ logging.h \ logging/timer.h \ mapport.h \ - mempool_args.h \ + node/mempool_args.h \ memusage.h \ merkleblock.h \ net.h \ @@ -372,7 +372,7 @@ libbitcoin_node_a_SOURCES = \ kernel/context.cpp \ kernel/mempool_persist.cpp \ mapport.cpp \ - mempool_args.cpp \ + node/mempool_args.cpp \ net.cpp \ netgroup.cpp \ net_processing.cpp \ diff --git a/src/init.cpp b/src/init.cpp index 056aadb675d..c19d27453b4 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/mempool_args.cpp b/src/node/mempool_args.cpp similarity index 99% rename from src/mempool_args.cpp rename to src/node/mempool_args.cpp index f26f3729fd8..60993f1d8df 100644 --- a/src/mempool_args.cpp +++ b/src/node/mempool_args.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 +#include #include #include diff --git a/src/mempool_args.h b/src/node/mempool_args.h similarity index 87% rename from src/mempool_args.h rename to src/node/mempool_args.h index 72d202cca27..52d8b4f2655 100644 --- a/src/mempool_args.h +++ b/src/node/mempool_args.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_MEMPOOL_ARGS_H -#define BITCOIN_MEMPOOL_ARGS_H +#ifndef BITCOIN_NODE_MEMPOOL_ARGS_H +#define BITCOIN_NODE_MEMPOOL_ARGS_H #include @@ -24,4 +24,4 @@ struct MemPoolOptions; [[nodiscard]] std::optional ApplyArgsManOptions(const ArgsManager& argsman, const CChainParams& chainparams, kernel::MemPoolOptions& mempool_opts); -#endif // BITCOIN_MEMPOOL_ARGS_H +#endif // BITCOIN_NODE_MEMPOOL_ARGS_H diff --git a/src/test/fuzz/rbf.cpp b/src/test/fuzz/rbf.cpp index 4801635791a..1a06ae886ee 100644 --- a/src/test/fuzz/rbf.cpp +++ b/src/test/fuzz/rbf.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 +#include #include #include #include diff --git a/src/test/fuzz/tx_pool.cpp b/src/test/fuzz/tx_pool.cpp index b1db1a425fd..ed372d5d1fc 100644 --- a/src/test/fuzz/tx_pool.cpp +++ b/src/test/fuzz/tx_pool.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include -#include +#include #include #include #include diff --git a/src/test/fuzz/validation_load_mempool.cpp b/src/test/fuzz/validation_load_mempool.cpp index 90c1a71d9f5..8241dff1897 100644 --- a/src/test/fuzz/validation_load_mempool.cpp +++ b/src/test/fuzz/validation_load_mempool.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index f5076c043bb..76ab6bfa040 100644 --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include