diff options
author | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-08-07 10:17:31 +0200 |
---|---|---|
committer | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-08-17 18:28:15 +0200 |
commit | fa8fdbe22932a4717d2bc4060269da9bff228728 (patch) | |
tree | e3a79eb9c03ba7df66c2a1ecc057de59ddd80866 /src | |
parent | fad8c36aa9011c3f7b1183f8380577e16a2167a6 (diff) | |
download | bitcoin-fa8fdbe22932a4717d2bc4060269da9bff228728.tar.xz |
Remove unused includes from blockfilter.h
This removes unused includes, primitives/block found manually, and the
others by iwyu:
blockfilter.h should remove these lines:
- #include <serialize.h> // lines 16-16
- #include <undo.h> // lines 18-18
Diffstat (limited to 'src')
-rw-r--r-- | src/blockfilter.cpp | 2 | ||||
-rw-r--r-- | src/blockfilter.h | 13 | ||||
-rw-r--r-- | src/index/blockfilterindex.cpp | 1 | ||||
-rw-r--r-- | src/index/blockfilterindex.h | 2 | ||||
-rw-r--r-- | src/test/blockfilter_tests.cpp | 2 | ||||
-rw-r--r-- | src/test/util/blockfilter.cpp | 2 | ||||
-rw-r--r-- | src/wallet/test/util.cpp | 1 | ||||
-rw-r--r-- | src/wallet/test/wallet_tests.cpp | 1 |
8 files changed, 19 insertions, 5 deletions
diff --git a/src/blockfilter.cpp b/src/blockfilter.cpp index 2f465f1119..985a81f522 100644 --- a/src/blockfilter.cpp +++ b/src/blockfilter.cpp @@ -8,9 +8,11 @@ #include <blockfilter.h> #include <crypto/siphash.h> #include <hash.h> +#include <primitives/block.h> #include <primitives/transaction.h> #include <script/script.h> #include <streams.h> +#include <undo.h> #include <util/golombrice.h> #include <util/string.h> diff --git a/src/blockfilter.h b/src/blockfilter.h index fb5114edb3..8eab4afa76 100644 --- a/src/blockfilter.h +++ b/src/blockfilter.h @@ -5,19 +5,22 @@ #ifndef BITCOIN_BLOCKFILTER_H #define BITCOIN_BLOCKFILTER_H -#include <stdint.h> -#include <string> +#include <cstddef> +#include <cstdint> +#include <ios> #include <set> +#include <string> #include <unordered_set> +#include <utility> #include <vector> #include <attributes.h> -#include <primitives/block.h> -#include <serialize.h> #include <uint256.h> -#include <undo.h> #include <util/bytevectorhash.h> +class CBlock; +class CBlockUndo; + /** * This implements a Golomb-coded set as defined in BIP 158. It is a * compact, probabilistic data structure for testing set membership. diff --git a/src/index/blockfilterindex.cpp b/src/index/blockfilterindex.cpp index cc7d6687b8..b23d66ac1d 100644 --- a/src/index/blockfilterindex.cpp +++ b/src/index/blockfilterindex.cpp @@ -10,6 +10,7 @@ #include <index/blockfilterindex.h> #include <logging.h> #include <node/blockstorage.h> +#include <undo.h> #include <util/fs_helpers.h> #include <validation.h> diff --git a/src/index/blockfilterindex.h b/src/index/blockfilterindex.h index ce1961c776..10a1cfd2ee 100644 --- a/src/index/blockfilterindex.h +++ b/src/index/blockfilterindex.h @@ -12,6 +12,8 @@ #include <index/base.h> #include <util/hasher.h> +#include <unordered_map> + static const char* const DEFAULT_BLOCKFILTERINDEX = "0"; /** Interval between compact filter checkpoints. See BIP 157. */ diff --git a/src/test/blockfilter_tests.cpp b/src/test/blockfilter_tests.cpp index dfeac6ca42..b372f25ea9 100644 --- a/src/test/blockfilter_tests.cpp +++ b/src/test/blockfilter_tests.cpp @@ -7,8 +7,10 @@ #include <blockfilter.h> #include <core_io.h> +#include <primitives/block.h> #include <serialize.h> #include <streams.h> +#include <undo.h> #include <univalue.h> #include <util/strencodings.h> diff --git a/src/test/util/blockfilter.cpp b/src/test/util/blockfilter.cpp index a806844e34..19f3d51d5e 100644 --- a/src/test/util/blockfilter.cpp +++ b/src/test/util/blockfilter.cpp @@ -6,6 +6,8 @@ #include <chainparams.h> #include <node/blockstorage.h> +#include <primitives/block.h> +#include <undo.h> #include <validation.h> using node::BlockManager; diff --git a/src/wallet/test/util.cpp b/src/wallet/test/util.cpp index 069ab25f26..ad8613d515 100644 --- a/src/wallet/test/util.cpp +++ b/src/wallet/test/util.cpp @@ -9,6 +9,7 @@ #include <key_io.h> #include <streams.h> #include <test/util/setup_common.h> +#include <validationinterface.h> #include <wallet/context.h> #include <wallet/wallet.h> #include <wallet/walletdb.h> diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index 4abf6441d2..5c297d76e4 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -21,6 +21,7 @@ #include <test/util/setup_common.h> #include <util/translation.h> #include <validation.h> +#include <validationinterface.h> #include <wallet/coincontrol.h> #include <wallet/context.h> #include <wallet/receive.h> |