aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMacroFake <falke.marco@gmail.com>2022-08-02 15:21:47 +0200
committerMacroFake <falke.marco@gmail.com>2022-08-02 15:31:05 +0200
commitddddd6913b1bdee1cad89a32d363306ea1f7b8d7 (patch)
tree1b53a16e855503b3b7d8f5d4cd12ffee1a24aced
parentfac812ca835e0d843aba1d4db0e49d183018a29e (diff)
downloadbitcoin-ddddd6913b1bdee1cad89a32d363306ea1f7b8d7.tar.xz
sort after scripted-diff
-rwxr-xr-xci/test/06_script_b.sh2
-rw-r--r--src/Makefile.am16
-rw-r--r--src/init.cpp2
-rw-r--r--src/test/fuzz/tx_pool.cpp2
-rw-r--r--src/test/util/setup_common.cpp2
5 files changed, 12 insertions, 12 deletions
diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh
index 0d8d860f1b..3c02909212 100755
--- a/ci/test/06_script_b.sh
+++ b/ci/test/06_script_b.sh
@@ -44,8 +44,8 @@ if [ "${RUN_TIDY}" = "true" ]; then
" src/dbwrapper.cpp"\
" src/init"\
" src/kernel"\
- " src/node/mempool_args.cpp"\
" src/node/chainstate.cpp"\
+ " src/node/mempool_args.cpp"\
" src/policy/feerate.cpp"\
" src/policy/packages.cpp"\
" src/policy/settings.cpp"\
diff --git a/src/Makefile.am b/src/Makefile.am
index 1da6199137..22390ef2bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -139,7 +139,6 @@ BITCOIN_CORE_H = \
compat/cpuid.h \
compat/endian.h \
compressor.h \
- node/connection_types.h \
consensus/consensus.h \
consensus/tx_check.h \
consensus/tx_verify.h \
@@ -149,7 +148,6 @@ BITCOIN_CORE_H = \
dbwrapper.h \
deploymentinfo.h \
deploymentstatus.h \
- node/eviction.h \
external_signer.h \
flatfile.h \
fs.h \
@@ -184,7 +182,6 @@ BITCOIN_CORE_H = \
logging.h \
logging/timer.h \
mapport.h \
- node/mempool_args.h \
memusage.h \
merkleblock.h \
net.h \
@@ -199,13 +196,16 @@ BITCOIN_CORE_H = \
node/caches.h \
node/chainstate.h \
node/coin.h \
+ node/connection_types.h \
node/context.h \
+ node/eviction.h \
+ node/interface_ui.h \
+ node/mempool_args.h \
node/mempool_persist_args.h \
node/miner.h \
node/minisketchwrapper.h \
node/psbt.h \
node/transaction.h \
- node/interface_ui.h \
node/utxo_snapshot.h \
noui.h \
outputtype.h \
@@ -372,10 +372,9 @@ libbitcoin_node_a_SOURCES = \
kernel/context.cpp \
kernel/mempool_persist.cpp \
mapport.cpp \
- node/mempool_args.cpp \
net.cpp \
- netgroup.cpp \
net_processing.cpp \
+ netgroup.cpp \
node/blockstorage.cpp \
node/caches.cpp \
node/chainstate.cpp \
@@ -383,13 +382,14 @@ libbitcoin_node_a_SOURCES = \
node/connection_types.cpp \
node/context.cpp \
node/eviction.cpp \
+ node/interface_ui.cpp \
node/interfaces.cpp \
+ node/mempool_args.cpp \
node/mempool_persist_args.cpp \
node/miner.cpp \
node/minisketchwrapper.cpp \
node/psbt.cpp \
node/transaction.cpp \
- node/interface_ui.cpp \
noui.cpp \
policy/fees.cpp \
policy/fees_args.cpp \
@@ -402,8 +402,8 @@ libbitcoin_node_a_SOURCES = \
rpc/fees.cpp \
rpc/mempool.cpp \
rpc/mining.cpp \
- rpc/node.cpp \
rpc/net.cpp \
+ rpc/node.cpp \
rpc/output_script.cpp \
rpc/rawtransaction.cpp \
rpc/server.cpp \
diff --git a/src/init.cpp b/src/init.cpp
index c19d27453b..e3d13ad972 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -31,7 +31,6 @@
#include <interfaces/init.h>
#include <interfaces/node.h>
#include <mapport.h>
-#include <node/mempool_args.h>
#include <net.h>
#include <net_permissions.h>
#include <net_processing.h>
@@ -42,6 +41,7 @@
#include <node/chainstate.h>
#include <node/context.h>
#include <node/interface_ui.h>
+#include <node/mempool_args.h>
#include <node/mempool_persist_args.h>
#include <node/miner.h>
#include <policy/feerate.h>
diff --git a/src/test/fuzz/tx_pool.cpp b/src/test/fuzz/tx_pool.cpp
index ed372d5d1f..3191367870 100644
--- a/src/test/fuzz/tx_pool.cpp
+++ b/src/test/fuzz/tx_pool.cpp
@@ -3,8 +3,8 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <consensus/validation.h>
-#include <node/mempool_args.h>
#include <node/context.h>
+#include <node/mempool_args.h>
#include <node/miner.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 76ab6bfa04..dc6e000c65 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -14,12 +14,12 @@
#include <init.h>
#include <init/common.h>
#include <interfaces/chain.h>
-#include <node/mempool_args.h>
#include <net.h>
#include <net_processing.h>
#include <node/blockstorage.h>
#include <node/chainstate.h>
#include <node/context.h>
+#include <node/mempool_args.h>
#include <node/miner.h>
#include <noui.h>
#include <policy/fees.h>