Skip to content

Commit c6f4741

Browse files
latobaritalatobarita
authored
Merge pull request #4297 from graydon/april-2024-warning-police
April 2024 warning police Reviewed-by: marta-lokhova
2 parents 08d89bb + efb9d1e commit c6f4741

File tree

94 files changed

+163
-217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+163
-217
lines changed

‎Builds/VisualStudio/stellar-core.vcxproj

+20-10
Original file line numberDiff line numberDiff line change
@@ -1243,27 +1243,27 @@ exit /b 0
12431243
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">false</ExcludedFromBuild>
12441244
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">false</ExcludedFromBuild>
12451245
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">false</ExcludedFromBuild>
1246-
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">sh ../../hash-xdrs.sh ../../src/protocol-curr &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
1246+
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">wsl bash ../../hash-xdrs.sh ../../src/protocol-curr &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
12471247
<Message Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">running hash-xdrs.sh</Message>
12481248
<Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Outputs>
12491249
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">src/$(Configuration)/generated/xdr/Stellar-overlay.h;src/$(Configuration)/generated/xdr/Stellar-transaction.h;src/$(Configuration)/generated/xdr/Stellar-ledger.h;src/$(Configuration)/generated/xdr/Stellar-ledger-entries.h;src/$(Configuration)/generated/xdr/Stellar-SCP.h;src/$(Configuration)/generated/xdr/Stellar-types.h;src/$(Configuration)/generated/xdr/Stellar-contract-config-setting.h</AdditionalInputs>
12501250
<OutputItemType Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">None</OutputItemType>
1251-
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">sh ../../hash-xdrs.sh ../../src/protocol-next &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
1251+
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">wsl bash ../../hash-xdrs.sh ../../src/protocol-next &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
12521252
<Message Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">running hash-xdrs.sh</Message>
12531253
<Outputs Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Outputs>
12541254
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">src/$(Configuration)/generated/xdr/Stellar-overlay.h;src/$(Configuration)/generated/xdr/Stellar-transaction.h;src/$(Configuration)/generated/xdr/Stellar-ledger.h;src/$(Configuration)/generated/xdr/Stellar-ledger-entries.h;src/$(Configuration)/generated/xdr/Stellar-SCP.h;src/$(Configuration)/generated/xdr/Stellar-types.h;src/$(Configuration)/generated/xdr/Stellar-contract-config-setting.h</AdditionalInputs>
12551255
<OutputItemType Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">None</OutputItemType>
1256-
<Command Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">sh ../../hash-xdrs.sh ../../src/protocol-curr &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
1256+
<Command Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">wsl bash ../../hash-xdrs.sh ../../src/protocol-curr &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
12571257
<Message Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">running hash-xdrs.sh</Message>
12581258
<Outputs Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Outputs>
12591259
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">src/$(Configuration)/generated/xdr/Stellar-overlay.h;src/$(Configuration)/generated/xdr/Stellar-transaction.h;src/$(Configuration)/generated/xdr/Stellar-ledger.h;src/$(Configuration)/generated/xdr/Stellar-ledger-entries.h;src/$(Configuration)/generated/xdr/Stellar-SCP.h;src/$(Configuration)/generated/xdr/Stellar-types.h</AdditionalInputs>
12601260
<OutputItemType Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">None</OutputItemType>
1261-
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">sh ../../hash-xdrs.sh ../../src/protocol-next &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
1261+
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">wsl bash ../../hash-xdrs.sh ../../src/protocol-next &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
12621262
<Message Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">running hash-xdrs.sh</Message>
12631263
<Outputs Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Outputs>
12641264
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">src/$(Configuration)/generated/xdr/Stellar-overlay.h;src/$(Configuration)/generated/xdr/Stellar-transaction.h;src/$(Configuration)/generated/xdr/Stellar-ledger.h;src/$(Configuration)/generated/xdr/Stellar-ledger-entries.h;src/$(Configuration)/generated/xdr/Stellar-SCP.h;src/$(Configuration)/generated/xdr/Stellar-types.h</AdditionalInputs>
12651265
<OutputItemType Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">None</OutputItemType>
1266-
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">sh ../../hash-xdrs.sh ../../src/protocol-next &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
1266+
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">wsl bash ../../hash-xdrs.sh ../../src/protocol-next &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
12671267
<Message Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">running hash-xdrs.sh</Message>
12681268
<Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Outputs>
12691269
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">src/$(Configuration)/generated/xdr/Stellar-overlay.h;src/$(Configuration)/generated/xdr/Stellar-transaction.h;src/$(Configuration)/generated/xdr/Stellar-ledger.h;src/$(Configuration)/generated/xdr/Stellar-ledger-entries.h;src/$(Configuration)/generated/xdr/Stellar-SCP.h;src/$(Configuration)/generated/xdr/Stellar-types.h;src/$(Configuration)/generated/xdr/Stellar-contract-config-setting.h</AdditionalInputs>
@@ -1550,8 +1550,8 @@ exit /b 0
15501550
</CustomBuild>
15511551
<CustomBuild Include="..\..\src\main\StellarCoreVersion.cpp.in">
15521552
<FileType>Document</FileType>
1553-
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">sed.exe -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
1554-
<Command Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">sed.exe -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
1553+
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">wsl sed -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
1554+
<Command Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">wsl sed -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
15551555
<Message Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">Generating StellarCoreVersion.cpp</Message>
15561556
<Message Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">Generating StellarCoreVersion.cpp</Message>
15571557
<Outputs Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">../../src/main/StellarCoreVersion.cpp</Outputs>
@@ -1560,9 +1560,9 @@ exit /b 0
15601560
</AdditionalInputs>
15611561
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">
15621562
</AdditionalInputs>
1563-
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">sed.exe -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
1564-
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">sed.exe -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
1565-
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">sed.exe -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
1563+
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">wsl sed -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
1564+
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">wsl sed -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
1565+
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">wsl sed -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
15661566
<Message Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">Generating StellarCoreVersion.cpp</Message>
15671567
<Message Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">Generating StellarCoreVersion.cpp</Message>
15681568
<Message Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">Generating StellarCoreVersion.cpp</Message>
@@ -1614,13 +1614,23 @@ $(OutDir)\bin\cxxbridge.exe ..\..\src\rust\src\lib.rs --output src\$(Configurati
16141614
<Message>running bison for XDRQueryParser.yy</Message>
16151615
<Outputs>../../src/util/xdrquery/XDRQueryParser.h</Outputs>
16161616
<BuildInParallel>true</BuildInParallel>
1617+
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">wsl bison --defines=../../src/util/xdrquery/XDRQueryParser.h --output=../../src/util/xdrquery/XDRQueryParser.cpp ../../src/util/xdrquery/XDRQueryParser.yy</Command>
1618+
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">wsl bison --defines=../../src/util/xdrquery/XDRQueryParser.h --output=../../src/util/xdrquery/XDRQueryParser.cpp ../../src/util/xdrquery/XDRQueryParser.yy</Command>
1619+
<Command Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">wsl bison --defines=../../src/util/xdrquery/XDRQueryParser.h --output=../../src/util/xdrquery/XDRQueryParser.cpp ../../src/util/xdrquery/XDRQueryParser.yy</Command>
1620+
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">wsl bison --defines=../../src/util/xdrquery/XDRQueryParser.h --output=../../src/util/xdrquery/XDRQueryParser.cpp ../../src/util/xdrquery/XDRQueryParser.yy</Command>
1621+
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">wsl bison --defines=../../src/util/xdrquery/XDRQueryParser.h --output=../../src/util/xdrquery/XDRQueryParser.cpp ../../src/util/xdrquery/XDRQueryParser.yy</Command>
16171622
</CustomBuild>
16181623
<CustomBuild Include="..\..\src\util\xdrquery\XDRQueryScanner.ll">
16191624
<FileType>Document</FileType>
16201625
<Command>flex --outfile=../../src/util/xdrquery/XDRQueryScanner.cpp ../../src/util/xdrquery/XDRQueryScanner.ll</Command>
16211626
<Message>running flex for XDRQueryScanner.ll</Message>
16221627
<Outputs>../../src/util/xdrquery/XDRQueryScanner.cpp</Outputs>
16231628
<BuildInParallel>true</BuildInParallel>
1629+
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">wsl flex --outfile=../../src/util/xdrquery/XDRQueryScanner.cpp ../../src/util/xdrquery/XDRQueryScanner.ll</Command>
1630+
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">wsl flex --outfile=../../src/util/xdrquery/XDRQueryScanner.cpp ../../src/util/xdrquery/XDRQueryScanner.ll</Command>
1631+
<Command Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">wsl flex --outfile=../../src/util/xdrquery/XDRQueryScanner.cpp ../../src/util/xdrquery/XDRQueryScanner.ll</Command>
1632+
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">wsl flex --outfile=../../src/util/xdrquery/XDRQueryScanner.cpp ../../src/util/xdrquery/XDRQueryScanner.ll</Command>
1633+
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">wsl flex --outfile=../../src/util/xdrquery/XDRQueryScanner.cpp ../../src/util/xdrquery/XDRQueryScanner.ll</Command>
16241634
</CustomBuild>
16251635
<None Include="libmedida\libmedida.vcxproj" />
16261636
</ItemGroup>

‎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/BucketListSnapshot.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class SearchableBucketListSnapshot : public NonMovableOrCopyable
7575

7676
SearchableBucketListSnapshot(BucketSnapshotManager const& snapshotManager);
7777

78-
friend std::unique_ptr<SearchableBucketListSnapshot>
78+
friend std::shared_ptr<SearchableBucketListSnapshot>
7979
BucketSnapshotManager::getSearchableBucketListSnapshot() const;
8080

8181
public:

‎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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
#include "historywork/VerifyBucketWork.h"
1515
#include "ledger/LedgerManager.h"
1616
#include "ledger/LedgerTxn.h"
17+
#include "ledger/LedgerTypeUtils.h"
1718
#include "main/Application.h"
1819
#include "main/Config.h"
19-
#include "overlay/StellarXDR.h"
2020
#include "util/Fs.h"
2121
#include "util/GlobalChecks.h"
2222
#include "util/LogSlowExecution.h"
2323
#include "util/Logging.h"
2424
#include "util/TmpDir.h"
2525
#include "util/types.h"
26+
#include "xdr/Stellar-ledger.h"
2627
#include <filesystem>
2728
#include <fmt/chrono.h>
2829
#include <fmt/format.h>
29-
#include <fstream>
3030
#include <map>
3131
#include <regex>
3232
#include <set>

‎src/bucket/BucketManagerImpl.h

+2-2
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>
@@ -109,7 +109,7 @@ class BucketManagerImpl : public BucketManager
109109
std::string const& getTmpDir() override;
110110
std::string const& getBucketDir() const override;
111111
BucketList& getBucketList() override;
112-
BucketSnapshotManager& getBucketSnapshotManager() const;
112+
BucketSnapshotManager& getBucketSnapshotManager() const override;
113113
medida::Timer& getMergeTimer() override;
114114
MergeCounters readMergeCounters() override;
115115
void incrMergeCounters(MergeCounters const&) override;

‎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

0 commit comments

Comments
 (0)