Skip to content

Commit fac812c

Browse files
author
MacroFake
committed
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-
1 parent 6666438 commit fac812c

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

ci/test/06_script_b.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ if [ "${RUN_TIDY}" = "true" ]; then
4444
" src/dbwrapper.cpp"\
4545
" src/init"\
4646
" src/kernel"\
47-
" src/mempool_args.cpp"\
47+
" src/node/mempool_args.cpp"\
4848
" src/node/chainstate.cpp"\
4949
" src/policy/feerate.cpp"\
5050
" src/policy/packages.cpp"\

src/Makefile.am

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ BITCOIN_CORE_H = \
184184
logging.h \
185185
logging/timer.h \
186186
mapport.h \
187-
mempool_args.h \
187+
node/mempool_args.h \
188188
memusage.h \
189189
merkleblock.h \
190190
net.h \
@@ -372,7 +372,7 @@ libbitcoin_node_a_SOURCES = \
372372
kernel/context.cpp \
373373
kernel/mempool_persist.cpp \
374374
mapport.cpp \
375-
mempool_args.cpp \
375+
node/mempool_args.cpp \
376376
net.cpp \
377377
netgroup.cpp \
378378
net_processing.cpp \

src/init.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <interfaces/init.h>
3232
#include <interfaces/node.h>
3333
#include <mapport.h>
34-
#include <mempool_args.h>
34+
#include <node/mempool_args.h>
3535
#include <net.h>
3636
#include <net_permissions.h>
3737
#include <net_processing.h>

src/mempool_args.cpp renamed to src/node/mempool_args.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <mempool_args.h>
5+
#include <node/mempool_args.h>
66

77
#include <kernel/mempool_limits.h>
88
#include <kernel/mempool_options.h>

src/mempool_args.h renamed to src/node/mempool_args.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#ifndef BITCOIN_MEMPOOL_ARGS_H
6-
#define BITCOIN_MEMPOOL_ARGS_H
5+
#ifndef BITCOIN_NODE_MEMPOOL_ARGS_H
6+
#define BITCOIN_NODE_MEMPOOL_ARGS_H
77

88
#include <optional>
99

@@ -24,4 +24,4 @@ struct MemPoolOptions;
2424
[[nodiscard]] std::optional<bilingual_str> ApplyArgsManOptions(const ArgsManager& argsman, const CChainParams& chainparams, kernel::MemPoolOptions& mempool_opts);
2525

2626

27-
#endif // BITCOIN_MEMPOOL_ARGS_H
27+
#endif // BITCOIN_NODE_MEMPOOL_ARGS_H

src/test/fuzz/rbf.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <mempool_args.h>
5+
#include <node/mempool_args.h>
66
#include <policy/rbf.h>
77
#include <primitives/transaction.h>
88
#include <sync.h>

src/test/fuzz/tx_pool.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
#include <consensus/validation.h>
6-
#include <mempool_args.h>
6+
#include <node/mempool_args.h>
77
#include <node/context.h>
88
#include <node/miner.h>
99
#include <test/fuzz/FuzzedDataProvider.h>

src/test/fuzz/validation_load_mempool.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <kernel/mempool_persist.h>
66

77
#include <chainparamsbase.h>
8-
#include <mempool_args.h>
8+
#include <node/mempool_args.h>
99
#include <node/mempool_persist_args.h>
1010
#include <test/fuzz/FuzzedDataProvider.h>
1111
#include <test/fuzz/fuzz.h>

src/test/util/setup_common.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <init.h>
1515
#include <init/common.h>
1616
#include <interfaces/chain.h>
17-
#include <mempool_args.h>
17+
#include <node/mempool_args.h>
1818
#include <net.h>
1919
#include <net_processing.h>
2020
#include <node/blockstorage.h>

0 commit comments

Comments
 (0)