aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheCharlatan <seb.kung@gmail.com>2023-04-18 13:48:49 +0200
committerTheCharlatan <seb.kung@gmail.com>2023-05-09 15:49:19 +0200
commitd168458d1ff987e0d741c75ac1d4b63ae0cfb7e7 (patch)
tree4decc679750e1982cd8491778160861920ed0710
parente9ee8aaf3acdf6dce2b339916d4c602484570050 (diff)
downloadbitcoin-d168458d1ff987e0d741c75ac1d4b63ae0cfb7e7.tar.xz
scripted-diff: Remove unused chainparamsbase includes
This is a follow-up to previous commits moving the chain constants out of chainparamsbase. The script removes the chainparamsbase header in all files where it is included, but not used. This is done by filtering against all defined symbols of the header as well as its respective .cpp file. The kernel chainparams now no longer relies on chainparamsbase. -BEGIN VERIFY SCRIPT- sed -i '/#include <chainparamsbase.h>/d' $( git grep -l 'chainparamsbase.h' | xargs grep -L 'CBaseChainParams\|CreateBaseChainParams\|SetupChainParamsBaseOptions\|BaseParams\|SelectBaseParams\|chainparamsbase.cpp' ) -END VERIFY SCRIPT-
-rw-r--r--src/bench/rpc_mempool.cpp1
-rw-r--r--src/chainparams.h1
-rw-r--r--src/kernel/chainparams.cpp1
-rw-r--r--src/qt/networkstyle.cpp1
-rw-r--r--src/rpc/external_signer.cpp1
-rw-r--r--src/test/fuzz/coins_view.cpp1
-rw-r--r--src/test/fuzz/connman.cpp1
-rw-r--r--src/test/fuzz/key.cpp1
-rw-r--r--src/test/fuzz/net.cpp1
-rw-r--r--src/test/fuzz/script_sigcache.cpp1
-rw-r--r--src/test/fuzz/script_sign.cpp1
-rw-r--r--src/test/fuzz/util.h1
-rw-r--r--src/test/fuzz/validation_load_mempool.cpp1
-rw-r--r--src/test/util/setup_common.h1
14 files changed, 0 insertions, 14 deletions
diff --git a/src/bench/rpc_mempool.cpp b/src/bench/rpc_mempool.cpp
index af1fa7c572..7e274370e0 100644
--- a/src/bench/rpc_mempool.cpp
+++ b/src/bench/rpc_mempool.cpp
@@ -3,7 +3,6 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <bench/bench.h>
-#include <chainparamsbase.h>
#include <kernel/cs_main.h>
#include <kernel/mempool_entry.h>
#include <rpc/mempool.h>
diff --git a/src/chainparams.h b/src/chainparams.h
index 6c124da907..6a65f40f80 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -8,7 +8,6 @@
#include <kernel/chainparams.h>
-#include <chainparamsbase.h>
#include <consensus/params.h>
#include <netaddress.h>
#include <primitives/block.h>
diff --git a/src/kernel/chainparams.cpp b/src/kernel/chainparams.cpp
index 065ad17fc8..d9ed1547b3 100644
--- a/src/kernel/chainparams.cpp
+++ b/src/kernel/chainparams.cpp
@@ -10,7 +10,6 @@
#include <consensus/merkle.h>
#include <consensus/params.h>
#include <hash.h>
-#include <chainparamsbase.h>
#include <logging.h>
#include <primitives/block.h>
#include <primitives/transaction.h>
diff --git a/src/qt/networkstyle.cpp b/src/qt/networkstyle.cpp
index e9ec4349b5..b6314f5533 100644
--- a/src/qt/networkstyle.cpp
+++ b/src/qt/networkstyle.cpp
@@ -6,7 +6,6 @@
#include <qt/guiconstants.h>
-#include <chainparamsbase.h>
#include <tinyformat.h>
#include <util/chaintype.h>
diff --git a/src/rpc/external_signer.cpp b/src/rpc/external_signer.cpp
index b7d065ad57..ac135ba216 100644
--- a/src/rpc/external_signer.cpp
+++ b/src/rpc/external_signer.cpp
@@ -2,7 +2,6 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#include <chainparamsbase.h>
#include <common/args.h>
#include <external_signer.h>
#include <rpc/protocol.h>
diff --git a/src/test/fuzz/coins_view.cpp b/src/test/fuzz/coins_view.cpp
index 5843b80c0a..fc7e000dc7 100644
--- a/src/test/fuzz/coins_view.cpp
+++ b/src/test/fuzz/coins_view.cpp
@@ -3,7 +3,6 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <chainparams.h>
-#include <chainparamsbase.h>
#include <coins.h>
#include <consensus/amount.h>
#include <consensus/tx_check.h>
diff --git a/src/test/fuzz/connman.cpp b/src/test/fuzz/connman.cpp
index 0f3c850e66..f81658b832 100644
--- a/src/test/fuzz/connman.cpp
+++ b/src/test/fuzz/connman.cpp
@@ -4,7 +4,6 @@
#include <addrman.h>
#include <chainparams.h>
-#include <chainparamsbase.h>
#include <common/args.h>
#include <net.h>
#include <netaddress.h>
diff --git a/src/test/fuzz/key.cpp b/src/test/fuzz/key.cpp
index e22321c71e..3eab2e20c0 100644
--- a/src/test/fuzz/key.cpp
+++ b/src/test/fuzz/key.cpp
@@ -3,7 +3,6 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <chainparams.h>
-#include <chainparamsbase.h>
#include <key.h>
#include <key_io.h>
#include <outputtype.h>
diff --git a/src/test/fuzz/net.cpp b/src/test/fuzz/net.cpp
index ca10381e4a..e090f13061 100644
--- a/src/test/fuzz/net.cpp
+++ b/src/test/fuzz/net.cpp
@@ -3,7 +3,6 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <chainparams.h>
-#include <chainparamsbase.h>
#include <net.h>
#include <net_permissions.h>
#include <netaddress.h>
diff --git a/src/test/fuzz/script_sigcache.cpp b/src/test/fuzz/script_sigcache.cpp
index de895cc69c..f332987987 100644
--- a/src/test/fuzz/script_sigcache.cpp
+++ b/src/test/fuzz/script_sigcache.cpp
@@ -3,7 +3,6 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <chainparams.h>
-#include <chainparamsbase.h>
#include <key.h>
#include <pubkey.h>
#include <script/sigcache.h>
diff --git a/src/test/fuzz/script_sign.cpp b/src/test/fuzz/script_sign.cpp
index 84930d42ef..8b62daf162 100644
--- a/src/test/fuzz/script_sign.cpp
+++ b/src/test/fuzz/script_sign.cpp
@@ -3,7 +3,6 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <chainparams.h>
-#include <chainparamsbase.h>
#include <key.h>
#include <psbt.h>
#include <pubkey.h>
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
index c14f633029..5f2aff08da 100644
--- a/src/test/fuzz/util.h
+++ b/src/test/fuzz/util.h
@@ -6,7 +6,6 @@
#define BITCOIN_TEST_FUZZ_UTIL_H
#include <arith_uint256.h>
-#include <chainparamsbase.h>
#include <coins.h>
#include <compat/compat.h>
#include <consensus/amount.h>
diff --git a/src/test/fuzz/validation_load_mempool.cpp b/src/test/fuzz/validation_load_mempool.cpp
index 817593cf6e..4e2ca6d903 100644
--- a/src/test/fuzz/validation_load_mempool.cpp
+++ b/src/test/fuzz/validation_load_mempool.cpp
@@ -4,7 +4,6 @@
#include <kernel/mempool_persist.h>
-#include <chainparamsbase.h>
#include <node/mempool_args.h>
#include <node/mempool_persist_args.h>
#include <test/fuzz/FuzzedDataProvider.h>
diff --git a/src/test/util/setup_common.h b/src/test/util/setup_common.h
index a93e1559dd..bd5a81be45 100644
--- a/src/test/util/setup_common.h
+++ b/src/test/util/setup_common.h
@@ -5,7 +5,6 @@
#ifndef BITCOIN_TEST_UTIL_SETUP_COMMON_H
#define BITCOIN_TEST_UTIL_SETUP_COMMON_H
-#include <chainparamsbase.h>
#include <common/args.h>
#include <key.h>
#include <node/caches.h>