diff options
| -rwxr-xr-x | ci/test/06_script_b.sh | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/init.cpp | 2 | ||||
| -rw-r--r-- | src/node/mempool_args.cpp (renamed from src/mempool_args.cpp) | 2 | ||||
| -rw-r--r-- | src/node/mempool_args.h (renamed from src/mempool_args.h) | 6 | ||||
| -rw-r--r-- | src/test/fuzz/rbf.cpp | 2 | ||||
| -rw-r--r-- | src/test/fuzz/tx_pool.cpp | 2 | ||||
| -rw-r--r-- | src/test/fuzz/validation_load_mempool.cpp | 2 | ||||
| -rw-r--r-- | src/test/util/setup_common.cpp | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh index 978830b7e2..0d8d860f1b 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 23bc180095..1da6199137 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 056aadb675..c19d27453b 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -31,7 +31,7 @@ #include <interfaces/init.h> #include <interfaces/node.h> #include <mapport.h> -#include <mempool_args.h> +#include <node/mempool_args.h> #include <net.h> #include <net_permissions.h> #include <net_processing.h> diff --git a/src/mempool_args.cpp b/src/node/mempool_args.cpp index f26f3729fd..60993f1d8d 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 <mempool_args.h> +#include <node/mempool_args.h> #include <kernel/mempool_limits.h> #include <kernel/mempool_options.h> diff --git a/src/mempool_args.h b/src/node/mempool_args.h index 72d202cca2..52d8b4f265 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 <optional> @@ -24,4 +24,4 @@ struct MemPoolOptions; [[nodiscard]] std::optional<bilingual_str> 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 4801635791..1a06ae886e 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 <mempool_args.h> +#include <node/mempool_args.h> #include <policy/rbf.h> #include <primitives/transaction.h> #include <sync.h> diff --git a/src/test/fuzz/tx_pool.cpp b/src/test/fuzz/tx_pool.cpp index b1db1a425f..ed372d5d1f 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 <consensus/validation.h> -#include <mempool_args.h> +#include <node/mempool_args.h> #include <node/context.h> #include <node/miner.h> #include <test/fuzz/FuzzedDataProvider.h> diff --git a/src/test/fuzz/validation_load_mempool.cpp b/src/test/fuzz/validation_load_mempool.cpp index 90c1a71d9f..8241dff189 100644 --- a/src/test/fuzz/validation_load_mempool.cpp +++ b/src/test/fuzz/validation_load_mempool.cpp @@ -5,7 +5,7 @@ #include <kernel/mempool_persist.h> #include <chainparamsbase.h> -#include <mempool_args.h> +#include <node/mempool_args.h> #include <node/mempool_persist_args.h> #include <test/fuzz/FuzzedDataProvider.h> #include <test/fuzz/fuzz.h> diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index f5076c043b..76ab6bfa04 100644 --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -14,7 +14,7 @@ #include <init.h> #include <init/common.h> #include <interfaces/chain.h> -#include <mempool_args.h> +#include <node/mempool_args.h> #include <net.h> #include <net_processing.h> #include <node/blockstorage.h> |