Switch to llvm 17 tools (#1002)

Fixes #952
2025-11-28 07:35:52 +00:00 · 2023-11-28 20:09:58 +00:00
parent 1be368dcaf
commit 35f119a268
305 changed files with 3955 additions and 1704 deletions
--- a/unittests/data/BackendCountersTests.cpp
+++ b/unittests/data/BackendCountersTests.cpp
@@ -17,13 +17,19 @@
 */
 //==============================================================================

-#include <data/BackendCounters.h>
-#include <util/MockPrometheus.h>
+#include "data/BackendCounters.h"
+#include "util/MockPrometheus.h"
+#include "util/prometheus/Counter.h"
+#include "util/prometheus/Gauge.h"
+#include "util/prometheus/Histogram.h"

+#include <boost/json/object.hpp>
 #include <boost/json/parse.hpp>
-#include <boost/json/serialize.hpp>
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>

+#include <chrono>
+
 using namespace data;
 using namespace util::prometheus;

--- a/unittests/data/BackendFactoryTests.cpp
+++ b/unittests/data/BackendFactoryTests.cpp
@@ -17,13 +17,18 @@
 */
 //==============================================================================

-#include <data/BackendFactory.h>
-#include <util/Fixtures.h>
+#include "data/BackendFactory.h"
+#include "data/cassandra/Handle.h"
+#include "util/Fixtures.h"
+#include "util/config/Config.h"

-#include <boost/json.hpp>
+#include <boost/json/parse.hpp>
 #include <fmt/core.h>
 #include <gtest/gtest.h>

+#include <stdexcept>
+#include <string>
+
 namespace {
 constexpr auto contactPoints = "127.0.0.1";
 constexpr auto keyspace = "factory_test";
--- a/unittests/data/cassandra/AsyncExecutorTests.cpp
+++ b/unittests/data/cassandra/AsyncExecutorTests.cpp
@@ -17,13 +17,21 @@
 */
 //==============================================================================

-#include <data/cassandra/impl/FakesAndMocks.h>
-#include <util/Fixtures.h>
-
-#include <data/cassandra/Error.h>
-#include <data/cassandra/impl/AsyncExecutor.h>
+#include "data/cassandra/Error.h"
+#include "data/cassandra/impl/AsyncExecutor.h"
+#include "data/cassandra/impl/FakesAndMocks.h"
+#include "util/Fixtures.h"

+#include <boost/asio/io_context.hpp>
+#include <cassandra.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <atomic>
+#include <functional>
+#include <optional>
+#include <thread>
+#include <utility>

 using namespace data::cassandra;
 using namespace data::cassandra::detail;
--- a/unittests/data/cassandra/BackendTests.cpp
+++ b/unittests/data/cassandra/BackendTests.cpp
@@ -17,18 +17,49 @@
 */
 //==============================================================================

-#include <util/Fixtures.h>
-#include <util/StringUtils.h>
-
-#include <data/CassandraBackend.h>
-#include <etl/NFTHelpers.h>
-#include <rpc/RPCHelpers.h>
-#include <util/Random.h>
-#include <util/config/Config.h>
+#include "data/BackendInterface.h"
+#include "data/CassandraBackend.h"
+#include "data/DBHelpers.h"
+#include "data/Types.h"
+#include "data/cassandra/Handle.h"
+#include "data/cassandra/SettingsProvider.h"
+#include "etl/NFTHelpers.h"
+#include "rpc/RPCHelpers.h"
+#include "util/Fixtures.h"
+#include "util/LedgerUtils.h"
+#include "util/Random.h"
+#include "util/StringUtils.h"
+#include "util/config/Config.h"

+#include <boost/asio/impl/spawn.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/spawn.hpp>
 #include <boost/json/parse.hpp>
-#include <fmt/compile.h>
+#include <fmt/core.h>
 #include <gtest/gtest.h>
+#include <ripple/basics/Slice.h>
+#include <ripple/basics/base_uint.h>
+#include <ripple/basics/strHex.h>
+#include <ripple/protocol/AccountID.h>
+#include <ripple/protocol/LedgerHeader.h>
+#include <ripple/protocol/STTx.h>
+#include <ripple/protocol/Serializer.h>
+#include <ripple/protocol/TxMeta.h>
+
+#include <algorithm>
+#include <atomic>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <map>
+#include <memory>
+#include <optional>
+#include <random>
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <utility>
+#include <vector>

 using namespace util;
 using namespace std;
@@ -384,8 +415,8 @@ TEST_F(BackendCassandraTest, Basic)
                std::string{metaBlob}
            );
            backend->writeAccountTransactions(std::move(accountTxData));
-            backend->writeNFTs(std::move(nftData));
-            backend->writeNFTTransactions(std::move(parsedNFTTxs));
+            backend->writeNFTs(nftData);
+            backend->writeNFTTransactions(parsedNFTTxs);

            backend->writeLedgerObject(std::string{accountIndexBlob}, lgrInfoNext.seq, std::string{accountBlob});
            backend->writeSuccessor(uint256ToString(data::firstKey), lgrInfoNext.seq, std::string{accountIndexBlob});
@@ -668,8 +699,8 @@ TEST_F(BackendCassandraTest, Basic)
                } while (cursor);
                EXPECT_EQ(retData.size(), data.size());
                for (size_t i = 0; i < retData.size(); ++i) {
-                    auto [txn, meta, _, __] = retData[i];
-                    auto [___, expTxn, expMeta] = data[i];
+                    auto [txn, meta, _, _2] = retData[i];
+                    auto [_3, expTxn, expMeta] = data[i];
                    EXPECT_STREQ(reinterpret_cast<const char*>(txn.data()), static_cast<const char*>(expTxn.data()));
                    EXPECT_STREQ(reinterpret_cast<const char*>(meta.data()), static_cast<const char*>(expMeta.data()));
                }
--- a/unittests/data/cassandra/BaseTests.cpp
+++ b/unittests/data/cassandra/BaseTests.cpp
@@ -17,14 +17,24 @@
 */
 //==============================================================================

-#include <util/Fixtures.h>
-
-#include <data/cassandra/Handle.h>
+#include "data/cassandra/Handle.h"
+#include "data/cassandra/Types.h"
+#include "util/Fixtures.h"

+#include <cassandra.h>
 #include <fmt/core.h>
 #include <gtest/gtest.h>

+#include <algorithm>
+#include <chrono>
+#include <cstdint>
+#include <iterator>
+#include <optional>
 #include <semaphore>
+#include <string>
+#include <string_view>
+#include <type_traits>
+#include <vector>

 using namespace std;

--- a/unittests/data/cassandra/ExecutionStrategyTests.cpp
+++ b/unittests/data/cassandra/ExecutionStrategyTests.cpp
@@ -17,13 +17,30 @@
 */
 //==============================================================================

-#include <data/cassandra/impl/FakesAndMocks.h>
-#include <util/Fixtures.h>
-
-#include <data/cassandra/impl/ExecutionStrategy.h>
+#include "data/BackendInterface.h"
+#include "data/cassandra/Error.h"
+#include "data/cassandra/Types.h"
+#include "data/cassandra/impl/ExecutionStrategy.h"
+#include "data/cassandra/impl/FakesAndMocks.h"
+#include "util/Fixtures.h"

+#include <boost/asio/io_context.hpp>
+#include <boost/asio/spawn.hpp>
+#include <boost/json/object.hpp>
+#include <cassandra.h>
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>

+#include <atomic>
+#include <chrono>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <stdexcept>
+#include <thread>
+#include <vector>
+
 using namespace data::cassandra;
 using namespace data::cassandra::detail;
 using namespace testing;
--- a/unittests/data/cassandra/RetryPolicyTests.cpp
+++ b/unittests/data/cassandra/RetryPolicyTests.cpp
@@ -17,13 +17,17 @@
 */
 //==============================================================================

-#include <util/Fixtures.h>
-
-#include <data/cassandra/Error.h>
-#include <data/cassandra/impl/RetryPolicy.h>
+#include "data/cassandra/Error.h"
+#include "data/cassandra/impl/RetryPolicy.h"
+#include "util/Fixtures.h"

+#include <boost/asio/io_context.hpp>
+#include <cassandra.h>
 #include <gtest/gtest.h>

+#include <atomic>
+#include <optional>
+
 using namespace data::cassandra;
 using namespace data::cassandra::detail;
 using namespace testing;
--- a/unittests/data/cassandra/SettingsProviderTests.cpp
+++ b/unittests/data/cassandra/SettingsProviderTests.cpp
@@ -17,16 +17,18 @@
 */
 //==============================================================================

-#include <util/Fixtures.h>
-#include <util/TmpFile.h>
-
-#include <data/cassandra/SettingsProvider.h>
-#include <util/config/Config.h>
+#include "data/cassandra/SettingsProvider.h"
+#include "data/cassandra/Types.h"
+#include "util/Fixtures.h"
+#include "util/TmpFile.h"
+#include "util/config/Config.h"

 #include <boost/json/parse.hpp>
 #include <fmt/core.h>
 #include <gtest/gtest.h>

+#include <chrono>
+#include <optional>
 #include <thread>
 #include <variant>

--- a/unittests/data/cassandra/impl/FakesAndMocks.h
+++ b/unittests/data/cassandra/impl/FakesAndMocks.h
@@ -17,8 +17,8 @@
 */
 //==============================================================================

-#include <data/cassandra/Error.h>
-#include <data/cassandra/impl/AsyncExecutor.h>
+#include "data/cassandra/Error.h"
+#include "data/cassandra/impl/AsyncExecutor.h"

 #include <gmock/gmock.h>