Skip to content

Commit fa8fdbe

Browse files
author
MarcoFalke
committed
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
1 parent fad8c36 commit fa8fdbe

File tree

8 files changed

+19
-5
lines changed

8 files changed

+19
-5
lines changed

src/blockfilter.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
#include <blockfilter.h>
99
#include <crypto/siphash.h>
1010
#include <hash.h>
11+
#include <primitives/block.h>
1112
#include <primitives/transaction.h>
1213
#include <script/script.h>
1314
#include <streams.h>
15+
#include <undo.h>
1416
#include <util/golombrice.h>
1517
#include <util/string.h>
1618

src/blockfilter.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,22 @@
55
#ifndef BITCOIN_BLOCKFILTER_H
66
#define BITCOIN_BLOCKFILTER_H
77

8-
#include <stdint.h>
9-
#include <string>
8+
#include <cstddef>
9+
#include <cstdint>
10+
#include <ios>
1011
#include <set>
12+
#include <string>
1113
#include <unordered_set>
14+
#include <utility>
1215
#include <vector>
1316

1417
#include <attributes.h>
15-
#include <primitives/block.h>
16-
#include <serialize.h>
1718
#include <uint256.h>
18-
#include <undo.h>
1919
#include <util/bytevectorhash.h>
2020

21+
class CBlock;
22+
class CBlockUndo;
23+
2124
/**
2225
* This implements a Golomb-coded set as defined in BIP 158. It is a
2326
* compact, probabilistic data structure for testing set membership.

src/index/blockfilterindex.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <index/blockfilterindex.h>
1111
#include <logging.h>
1212
#include <node/blockstorage.h>
13+
#include <undo.h>
1314
#include <util/fs_helpers.h>
1415
#include <validation.h>
1516

src/index/blockfilterindex.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#include <index/base.h>
1313
#include <util/hasher.h>
1414

15+
#include <unordered_map>
16+
1517
static const char* const DEFAULT_BLOCKFILTERINDEX = "0";
1618

1719
/** Interval between compact filter checkpoints. See BIP 157. */

src/test/blockfilter_tests.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77

88
#include <blockfilter.h>
99
#include <core_io.h>
10+
#include <primitives/block.h>
1011
#include <serialize.h>
1112
#include <streams.h>
13+
#include <undo.h>
1214
#include <univalue.h>
1315
#include <util/strencodings.h>
1416

src/test/util/blockfilter.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
#include <chainparams.h>
88
#include <node/blockstorage.h>
9+
#include <primitives/block.h>
10+
#include <undo.h>
911
#include <validation.h>
1012

1113
using node::BlockManager;

src/wallet/test/util.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <key_io.h>
1010
#include <streams.h>
1111
#include <test/util/setup_common.h>
12+
#include <validationinterface.h>
1213
#include <wallet/context.h>
1314
#include <wallet/wallet.h>
1415
#include <wallet/walletdb.h>

src/wallet/test/wallet_tests.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <test/util/setup_common.h>
2222
#include <util/translation.h>
2323
#include <validation.h>
24+
#include <validationinterface.h>
2425
#include <wallet/coincontrol.h>
2526
#include <wallet/context.h>
2627
#include <wallet/receive.h>

0 commit comments

Comments
 (0)