From d168458d1ff987e0d741c75ac1d4b63ae0cfb7e7 Mon Sep 17 00:00:00 2001 From: TheCharlatan Date: Tue, 18 Apr 2023 13:48:49 +0200 Subject: [PATCH] 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 /d' $( git grep -l 'chainparamsbase.h' | xargs grep -L 'CBaseChainParams\|CreateBaseChainParams\|SetupChainParamsBaseOptions\|BaseParams\|SelectBaseParams\|chainparamsbase.cpp' ) -END VERIFY SCRIPT- --- src/bench/rpc_mempool.cpp | 1 - src/chainparams.h | 1 - src/kernel/chainparams.cpp | 1 - src/qt/networkstyle.cpp | 1 - src/rpc/external_signer.cpp | 1 - src/test/fuzz/coins_view.cpp | 1 - src/test/fuzz/connman.cpp | 1 - src/test/fuzz/key.cpp | 1 - src/test/fuzz/net.cpp | 1 - src/test/fuzz/script_sigcache.cpp | 1 - src/test/fuzz/script_sign.cpp | 1 - src/test/fuzz/util.h | 1 - src/test/fuzz/validation_load_mempool.cpp | 1 - src/test/util/setup_common.h | 1 - 14 files changed, 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 -#include #include #include #include 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 -#include #include #include #include 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 #include #include -#include #include #include #include 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 -#include #include #include 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 #include #include #include 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 -#include #include #include #include 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 #include -#include #include #include #include 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 -#include #include #include #include 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 -#include #include #include #include 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 -#include #include #include #include