Skip to content

Commit 92478f6

Browse files
Merge #6900: backport: bitcoin#25645, bitcoin#25668 fix iwyu on node/chainstate, dbwrapper.h and related fixes
79f7424 fix: some iwyu recommendations to update includes (Konstantin Akimov) d5c8cab fix: missing iwyu from bitcoin#24974 (Konstantin Akimov) f1ad7a6 fix: missing iwyu items from bitcoin#25694 (Konstantin Akimov) b9a9630 fix: missing lint-tidy warnings from bitcoin#25254 (Konstantin Akimov) bf1dd33 Merge bitcoin#25668: refactor: Fix iwyu on node/chainstate (MacroFake) 7a3f393 Merge bitcoin#25645: refactor: Remove unused includes from dbwrapper.h (fanquake) Pull request description: ## Issue being fixed or feature implemented Some files has been missing when added to iwyu linter list. ## What was done? Backport bitcoin#25645, bitcoin#25668 missing fixes from bitcoin#24974, bitcoin#25694, bitcoin#25254 and related fixes to apply linter's messages. ## How Has This Been Tested? Revised output of CI iwuy ## Breaking Changes N/A ## Checklist: _Go over all the following points, and put an `x` in all the boxes that apply._ - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 79f7424 kwvg: utACK 79f7424 Tree-SHA512: 0ab2b87ea561adabace3339ea8742a661818d3e6e3793a7f5ed0a5dd9169bc55ade6e365da5ac31f90540e07a09682b07c53a707894f816581dbba826e7d91d4
2 parents 730b018 + 79f7424 commit 92478f6

File tree

18 files changed

+74
-13
lines changed

18 files changed

+74
-13
lines changed

ci/dash/lint-tidy.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,17 @@ fi
2121
cd "${BASE_ROOT_DIR}/build-ci/dashcore-${BUILD_TARGET}"
2222
iwyu_tool.py \
2323
"src/compat" \
24+
"src/dbwrapper.cpp" \
2425
"src/init" \
26+
"src/node/chainstate.cpp" \
27+
"src/policy/feerate.cpp" \
28+
"src/policy/packages.cpp" \
29+
"src/policy/settings.cpp" \
30+
"src/primitives/transaction.cpp" \
2531
"src/rpc/fees.cpp" \
2632
"src/rpc/signmessage.cpp" \
2733
"src/test/fuzz/txorphan.cpp" \
34+
"src/threadinterrupt.cpp" \
2835
"src/util/bip32.cpp" \
2936
"src/util/bytevectorhash.cpp" \
3037
"src/util/check.cpp" \

src/bench/checkblock.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <consensus/validation.h>
1010
#include <stats/client.h>
1111
#include <streams.h>
12+
#include <util/system.h>
1213
#include <validation.h>
1314

1415
#include <memory>

src/dbwrapper.cpp

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,26 @@
44

55
#include <dbwrapper.h>
66

7-
#include <memory>
7+
#include <fs.h>
8+
#include <logging.h>
89
#include <random.h>
10+
#include <util/strencodings.h>
11+
#include <util/system.h>
912

13+
#include <algorithm>
14+
#include <cassert>
15+
#include <cstdarg>
16+
#include <cstdint>
17+
#include <cstdio>
1018
#include <leveldb/cache.h>
19+
#include <leveldb/db.h>
1120
#include <leveldb/env.h>
1221
#include <leveldb/filter_policy.h>
1322
#include <leveldb/helpers/memenv/memenv.h>
14-
#include <stdint.h>
15-
#include <algorithm>
23+
#include <leveldb/iterator.h>
24+
#include <leveldb/options.h>
25+
#include <leveldb/status.h>
26+
#include <memory>
1627
#include <optional>
1728

1829
class CBitcoinLevelDBLogger : public leveldb::Logger {

src/dbwrapper.h

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,38 @@
55
#ifndef BITCOIN_DBWRAPPER_H
66
#define BITCOIN_DBWRAPPER_H
77

8+
#include <assert.h>
89
#include <clientversion.h>
910
#include <fs.h>
11+
#include <logging.h>
1012
#include <serialize.h>
1113
#include <span.h>
1214
#include <streams.h>
13-
#include <util/strencodings.h>
14-
#include <util/system.h>
1515

16-
#include <typeindex>
16+
#include <sys/types.h>
1717

18+
#include <algorithm>
19+
#include <cstddef>
20+
#include <cstdint>
21+
#include <exception>
1822
#include <leveldb/db.h>
23+
#include <leveldb/iterator.h>
24+
#include <leveldb/options.h>
25+
#include <leveldb/slice.h>
26+
#include <leveldb/status.h>
1927
#include <leveldb/write_batch.h>
28+
#include <map>
29+
#include <memory>
30+
#include <set>
31+
#include <stdexcept>
32+
#include <string>
33+
#include <type_traits>
34+
#include <utility>
35+
#include <vector>
36+
37+
namespace leveldb {
38+
class Env;
39+
}
2040

2141
static const size_t DBWRAPPER_PREALLOC_KEY_SIZE = 64;
2242
static const size_t DBWRAPPER_PREALLOC_VALUE_SIZE = 1024;

src/evo/evodb.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
#include <evo/evodb.h>
6+
#include <util/system.h>
67

78
#include <uint256.h>
89

src/evo/specialtxman.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <hash.h>
1212
#include <primitives/block.h>
1313
#include <util/irange.h>
14+
#include <util/system.h>
1415
#include <validation.h>
1516

1617
#include <chainlock/chainlock.h>

src/index/base.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <node/interface_ui.h>
99
#include <shutdown.h>
1010
#include <tinyformat.h>
11+
#include <util/system.h>
1112
#include <util/thread.h>
1213
#include <util/translation.h>
1314
#include <validation.h>

src/index/blockfilterindex.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <index/blockfilterindex.h>
1010
#include <node/blockstorage.h>
1111
#include <serialize.h>
12+
#include <util/system.h>
1213

1314
using node::UndoReadFromDisk;
1415

src/index/coinstatsindex.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <serialize.h>
1111
#include <txdb.h>
1212
#include <undo.h>
13+
#include <util/system.h>
1314
#include <validation.h>
1415
#include <util/check.h>
1516

src/init/common.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <node/interface_ui.h>
1717
#include <random.h>
1818
#include <tinyformat.h>
19+
#include <util/time.h>
1920
#include <util/string.h>
2021
#include <util/system.h>
2122
#include <util/translation.h>

0 commit comments

Comments
 (0)