Skip to content

Commit 080ee6d

Browse files
graydongraydon
committed
Some IWYU include-gardening in bucket.
1 parent 1bb88b7 commit 080ee6d

34 files changed

+40
-58
lines changed

‎src/bucket/Bucket.cpp

+1-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// ASIO is somewhat particular about when it gets included -- it wants to be the
66
// first to include <windows.h> -- so we try to include it before everything
77
// else.
8-
#include "util/asio.h"
8+
#include "util/asio.h" // IWYU pragma: keep
99
#include "bucket/Bucket.h"
1010
#include "bucket/BucketApplicator.h"
1111
#include "bucket/BucketList.h"
@@ -16,25 +16,19 @@
1616
#include "bucket/MergeKey.h"
1717
#include "crypto/Hex.h"
1818
#include "crypto/Random.h"
19-
#include "crypto/SHA.h"
2019
#include "database/Database.h"
21-
#include "ledger/LedgerHashUtils.h"
2220
#include "ledger/LedgerTxn.h"
2321
#include "ledger/LedgerTypeUtils.h"
2422
#include "main/Application.h"
2523
#include "medida/timer.h"
2624
#include "util/Fs.h"
2725
#include "util/GlobalChecks.h"
2826
#include "util/Logging.h"
29-
#include "util/TmpDir.h"
3027
#include "util/XDRStream.h"
3128
#include "util/types.h"
32-
#include "xdrpp/message.h"
3329
#include <Tracy.hpp>
34-
#include <future>
3530

3631
#include "medida/counter.h"
37-
#include "medida/meter.h"
3832

3933
namespace stellar
4034
{

‎src/bucket/Bucket.h

+7-5
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,18 @@
55
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
66

77
#include "bucket/BucketIndex.h"
8-
#include "crypto/Hex.h"
9-
#include "overlay/StellarXDR.h"
108
#include "util/NonCopyable.h"
119
#include "util/ProtocolVersion.h"
12-
#include "util/UnorderedMap.h"
13-
#include "util/UnorderedSet.h"
14-
#include "util/XDRStream.h"
10+
#include "xdr/Stellar-ledger.h"
11+
#include <list>
1512
#include <optional>
1613
#include <string>
1714

15+
namespace asio
16+
{
17+
class io_context;
18+
}
19+
1820
namespace medida
1921
{
2022
class Counter;

‎src/bucket/BucketApplicator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// under the Apache License, Version 2.0. See the COPYING file at the root
33
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
44

5-
#include "util/asio.h"
5+
#include "util/asio.h" // IWYU pragma: keep
66
#include "bucket/BucketApplicator.h"
77
#include "bucket/Bucket.h"
88
#include "bucket/BucketList.h"

‎src/bucket/BucketApplicator.h

-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
#include "bucket/Bucket.h"
88
#include "bucket/BucketInputIterator.h"
9-
#include "ledger/LedgerHashUtils.h"
109
#include "util/Timer.h"
11-
#include "util/XDRStream.h"
1210
#include <memory>
1311

1412
namespace stellar

‎src/bucket/BucketIndex.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
// under the Apache License, Version 2.0. See the COPYING file at the root
55
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
66

7-
#include "bucket/LedgerCmp.h"
87
#include "util/GlobalChecks.h"
98
#include "util/NonCopyable.h"
10-
#include <atomic>
9+
#include "util/XDROperators.h" // IWYU pragma: keep
10+
#include "xdr/Stellar-ledger-entries.h"
1111
#include <filesystem>
1212
#include <memory>
1313
#include <optional>

‎src/bucket/BucketIndexImpl.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
#include "bucket/BucketIndexImpl.h"
66
#include "bucket/Bucket.h"
77
#include "bucket/BucketManager.h"
8-
#include "bucket/LedgerCmp.h"
9-
#include "ledger/LedgerHashUtils.h"
8+
#include "crypto/ShortHash.h"
109
#include "main/Config.h"
1110
#include "util/Fs.h"
1211
#include "util/LogSlowExecution.h"

‎src/bucket/BucketInputIterator.h

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// under the Apache License, Version 2.0. See the COPYING file at the root
55
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
66

7-
#include "bucket/LedgerCmp.h"
87
#include "util/XDRStream.h"
98
#include "xdr/Stellar-ledger.h"
109

‎src/bucket/BucketList.cpp

-8
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,16 @@
77
#include "bucket/BucketInputIterator.h"
88
#include "bucket/BucketManager.h"
99
#include "bucket/BucketSnapshot.h"
10-
#include "bucket/LedgerCmp.h"
11-
#include "crypto/Hex.h"
12-
#include "crypto/Random.h"
1310
#include "crypto/SHA.h"
14-
#include "ledger/LedgerHashUtils.h"
1511
#include "ledger/LedgerManager.h"
1612
#include "ledger/LedgerTxn.h"
17-
#include "ledger/LedgerTypeUtils.h"
1813
#include "main/Application.h"
1914
#include "util/GlobalChecks.h"
2015
#include "util/Logging.h"
2116
#include "util/ProtocolVersion.h"
22-
#include "util/UnorderedSet.h"
23-
#include "util/XDRStream.h"
2417
#include "util/types.h"
2518

2619
#include "medida/counter.h"
27-
#include "medida/metrics_registry.h"
2820

2921
#include <Tracy.hpp>
3022
#include <fmt/format.h>

‎src/bucket/BucketList.h

-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66

77
#include "bucket/Bucket.h"
88
#include "bucket/FutureBucket.h"
9-
#include "bucket/LedgerCmp.h"
10-
#include "overlay/StellarXDR.h"
11-
#include "xdrpp/message.h"
12-
#include <future>
13-
#include <optional>
14-
#include <set>
159

1610
namespace medida
1711
{

‎src/bucket/BucketListSnapshot.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44

55
#include "bucket/BucketListSnapshot.h"
66
#include "bucket/BucketInputIterator.h"
7-
#include "crypto/SecretKey.h"
7+
#include "crypto/SecretKey.h" // IWYU pragma: keep
88
#include "ledger/LedgerTxn.h"
99

10-
#include "medida/meter.h"
11-
#include "medida/metrics_registry.h"
10+
#include "medida/timer.h"
1211

1312
namespace stellar
1413
{

‎src/bucket/BucketManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
66

77
#include "bucket/Bucket.h"
8-
#include "overlay/StellarXDR.h"
98
#include "util/NonCopyable.h"
9+
#include "util/types.h"
1010
#include <future>
1111
#include <map>
1212
#include <memory>

‎src/bucket/BucketManagerImpl.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,16 @@
1616
#include "ledger/LedgerTxn.h"
1717
#include "main/Application.h"
1818
#include "main/Config.h"
19-
#include "overlay/StellarXDR.h"
2019
#include "util/Fs.h"
2120
#include "util/GlobalChecks.h"
2221
#include "util/LogSlowExecution.h"
2322
#include "util/Logging.h"
2423
#include "util/TmpDir.h"
2524
#include "util/types.h"
25+
#include "xdr/Stellar-ledger.h"
2626
#include <filesystem>
2727
#include <fmt/chrono.h>
2828
#include <fmt/format.h>
29-
#include <fstream>
3029
#include <map>
3130
#include <regex>
3231
#include <set>

‎src/bucket/BucketManagerImpl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "bucket/BucketList.h"
44
#include "bucket/BucketManager.h"
55
#include "bucket/BucketMergeMap.h"
6-
#include "overlay/StellarXDR.h"
6+
#include "xdr/Stellar-ledger.h"
77

88
#include <map>
99
#include <memory>

‎src/bucket/BucketMergeMap.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include "bucket/MergeKey.h"
4-
#include "util/HashOfHash.h"
4+
#include "util/HashOfHash.h" // IWYU pragma: keep
55
#include "util/UnorderedMap.h"
66
#include "util/UnorderedSet.h"
77
#include "xdr/Stellar-types.h"

‎src/bucket/BucketOutputIterator.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include "bucket/Bucket.h"
77
#include "bucket/BucketIndex.h"
88
#include "bucket/BucketManager.h"
9-
#include "crypto/Random.h"
109
#include "util/GlobalChecks.h"
1110
#include <Tracy.hpp>
1211
#include <filesystem>

‎src/bucket/BucketSnapshot.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
#include "bucket/BucketListSnapshot.h"
88
#include "ledger/LedgerTxn.h"
99
#include "ledger/LedgerTypeUtils.h"
10-
11-
#include "medida/counter.h"
10+
#include "util/XDRStream.h"
1211

1312
namespace stellar
1413
{

‎src/bucket/BucketSnapshot.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
// under the Apache License, Version 2.0. See the COPYING file at the root
55
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
66

7+
#include "bucket/LedgerCmp.h"
78
#include "util/NonCopyable.h"
8-
#include "util/UnorderedMap.h"
9-
#include "util/UnorderedSet.h"
10-
#include "util/types.h"
9+
#include <list>
10+
#include <set>
1111

1212
#include <optional>
1313

‎src/bucket/BucketSnapshotManager.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "bucket/BucketSnapshotManager.h"
66
#include "bucket/BucketListSnapshot.h"
77
#include "main/Application.h"
8+
#include "util/XDRStream.h" // IWYU pragma: keep
89

910
#include "medida/meter.h"
1011
#include "medida/metrics_registry.h"

‎src/bucket/BucketSnapshotManager.h

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include "bucket/BucketManagerImpl.h"
88
#include "util/NonCopyable.h"
99
#include "util/UnorderedMap.h"
10-
#include "util/types.h"
1110

1211
#include <memory>
1312
#include <mutex>

‎src/bucket/FutureBucket.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// ASIO is somewhat particular about when it gets included -- it wants to be the
66
// first to include <windows.h> -- so we try to include it before everything
77
// else.
8-
#include "util/asio.h"
8+
#include "util/asio.h" // IWYU pragma: keep
99

1010
#include "bucket/Bucket.h"
1111
#include "bucket/BucketList.h"

‎src/bucket/FutureBucket.h

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// under the Apache License, Version 2.0. See the COPYING file at the root
55
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
66

7-
#include "overlay/StellarXDR.h"
87
#include "util/GlobalChecks.h"
98
#include <cereal/cereal.hpp>
109
#include <future>

‎src/bucket/LedgerCmp.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66

77
#include <type_traits>
88

9-
#include "overlay/StellarXDR.h"
10-
#include "util/XDROperators.h"
9+
#include "util/XDROperators.h" // IWYU pragma: keep
10+
#include "xdr/Stellar-ledger-entries.h"
11+
#include "xdr/Stellar-ledger.h"
1112

1213
namespace stellar
1314
{

‎src/bucket/MergeKey.h

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
66
#include "bucket/Bucket.h"
77
#include "xdr/Stellar-types.h"
8-
#include <cstdint>
98
#include <iosfwd>
109
#include <vector>
1110

‎src/bucket/test/BucketListTests.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "bucket/BucketManager.h"
1818
#include "bucket/BucketOutputIterator.h"
1919
#include "bucket/test/BucketTestUtils.h"
20+
#include "crypto/Hex.h"
2021
#include "ledger/test/LedgerTestUtils.h"
2122
#include "lib/catch.hpp"
2223
#include "lib/util/stdrandom.h"

‎src/bucket/test/BucketTestUtils.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "BucketTestUtils.h"
66
#include "bucket/BucketInputIterator.h"
77
#include "bucket/BucketManager.h"
8+
#include "crypto/Hex.h"
89
#include "herder/Herder.h"
910
#include "ledger/LedgerTxn.h"
1011
#include "main/Application.h"

‎src/catchup/ApplyBufferedLedgersWork.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "bucket/BucketList.h"
77
#include "bucket/BucketManager.h"
88
#include "catchup/ApplyLedgerWork.h"
9+
#include "crypto/Hex.h"
910
#include "ledger/LedgerManager.h"
1011
#include "main/Application.h"
1112
#include <Tracy.hpp>

‎src/catchup/AssumeStateWork.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "bucket/BucketList.h"
77
#include "bucket/BucketManager.h"
88
#include "catchup/IndexBucketsWork.h"
9+
#include "crypto/Hex.h"
910
#include "history/HistoryArchive.h"
1011
#include "work/WorkSequence.h"
1112
#include "work/WorkWithCallback.h"

‎src/catchup/IndexBucketsWork.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "bucket/BucketManager.h"
88
#include "util/HashOfHash.h"
99
#include "util/UnorderedSet.h"
10+
#include "util/XDRStream.h"
1011
#include "util/types.h"
1112
#include "work/WorkWithCallback.h"
1213
#include <Tracy.hpp>

‎src/historywork/CheckSingleLedgerHeaderWork.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "util/GlobalChecks.h"
1111
#include "util/Logging.h"
1212
#include "util/TmpDir.h"
13+
#include "util/XDRStream.h"
1314
#include "xdrpp/printer.h"
1415

1516
namespace stellar

‎src/ledger/InMemoryLedgerTxnRoot.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "ledger/LedgerRange.h"
77
#include "ledger/LedgerTxn.h"
88
#include "util/XDROperators.h"
9+
#include "util/XDRStream.h"
910
#include "util/types.h"
1011
#include "xdr/Stellar-ledger-entries.h"
1112
#include "xdrpp/marshal.h"

‎src/ledger/LedgerTxn.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "transactions/TransactionUtils.h"
2020
#include "util/GlobalChecks.h"
2121
#include "util/XDROperators.h"
22+
#include "util/XDRStream.h"
2223
#include "util/types.h"
2324
#include "xdr/Stellar-ledger-entries.h"
2425
#include "xdrpp/marshal.h"

‎src/ledger/NetworkConfig.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "bucket/BucketManager.h"
88
#include "main/Application.h"
99
#include "util/ProtocolVersion.h"
10+
#include <Tracy.hpp>
1011

1112
#ifdef BUILD_TESTS
1213
#include "ledger/LedgerManager.h"

‎src/main/ApplicationImpl.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "bucket/Bucket.h"
1818
#include "bucket/BucketManager.h"
1919
#include "catchup/ApplyBucketsWork.h"
20+
#include "crypto/Hex.h"
2021
#include "crypto/SHA.h"
2122
#include "crypto/SecretKey.h"
2223
#include "database/Database.h"

‎src/util/types.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
66

77
#include "bucket/LedgerCmp.h"
8-
#include "numeric.h"
9-
#include "overlay/StellarXDR.h"
10-
#include "xdrpp/message.h"
8+
#include "xdr/Stellar-ledger-entries.h"
9+
#include "xdr/Stellar-ledger.h"
10+
#include "xdr/Stellar-types.h"
1111
#include <set>
12-
#include <type_traits>
1312
#include <vector>
1413

1514
namespace stellar

0 commit comments

Comments
 (0)