Merge branch 'develop' into enable_asan

mathbunnyru · web-flow · commit aade268215f0 · 2025-09-16T14:53:38.000+01:00
diff --git a/src/util/log/Logger.cpp b/src/util/log/Logger.cpp
@@ -41,6 +41,7 @@
 #include <spdlog/spdlog.h>
 
 #include <algorithm>
+#include <array>
 #include <cstddef>
 #include <cstdint>
 #include <filesystem>
diff --git a/tests/common/util/TestHttpClient.cpp b/tests/common/util/TestHttpClient.cpp
@@ -46,7 +46,6 @@
 #include <openssl/tls1.h>
 
 #include <chrono>
-#include <optional>
 #include <string>
 #include <string_view>
 #include <utility>
diff --git a/tests/integration/data/cassandra/BaseTests.cpp b/tests/integration/data/cassandra/BaseTests.cpp
@@ -19,7 +19,6 @@
 
 #include "data/cassandra/Handle.hpp"
 #include "data/cassandra/Types.hpp"
-#include "util/LoggerFixtures.hpp"
 
 #include <TestGlobals.hpp>
 #include <cassandra.h>
diff --git a/tests/integration/migration/cassandra/CassandraMigrationManagerTests.cpp b/tests/integration/migration/cassandra/CassandraMigrationManagerTests.cpp
@@ -33,7 +33,6 @@
 #include "migration/impl/MigrationManagerBase.hpp"
 #include "migration/impl/MigratorsRegister.hpp"
 #include "util/CassandraDBHelper.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockPrometheus.hpp"
 #include "util/config/ConfigConstraints.hpp"
 #include "util/config/ConfigDefinition.hpp"
diff --git a/tests/unit/app/StopperTests.cpp b/tests/unit/app/StopperTests.cpp
@@ -18,7 +18,6 @@
 //==============================================================================
 #include "app/Stopper.hpp"
 #include "util/AsioContextTestFixture.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockBackend.hpp"
 #include "util/MockETLService.hpp"
 #include "util/MockLoadBalancer.hpp"
diff --git a/tests/unit/app/WebHandlersTests.cpp b/tests/unit/app/WebHandlersTests.cpp
@@ -20,7 +20,6 @@
 #include "app/WebHandlers.hpp"
 #include "rpc/Errors.hpp"
 #include "util/AsioContextTestFixture.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockPrometheus.hpp"
 #include "util/Taggable.hpp"
 #include "util/config/ConfigDefinition.hpp"
diff --git a/tests/unit/data/LedgerCacheTests.cpp b/tests/unit/data/LedgerCacheTests.cpp
@@ -18,7 +18,6 @@
 //==============================================================================
 
 #include "data/LedgerCache.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockPrometheus.hpp"
 #include "util/prometheus/Bool.hpp"
 
diff --git a/tests/unit/data/cassandra/SettingsProviderTests.cpp b/tests/unit/data/cassandra/SettingsProviderTests.cpp
@@ -19,7 +19,6 @@
 
 #include "data/cassandra/SettingsProvider.hpp"
 #include "data/cassandra/Types.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/TmpFile.hpp"
 #include "util/config/ConfigDefinition.hpp"
 #include "util/config/ConfigFileJson.hpp"
diff --git a/tests/unit/etl/CorruptionDetectorTests.cpp b/tests/unit/etl/CorruptionDetectorTests.cpp
@@ -19,7 +19,6 @@
 
 #include "etl/CorruptionDetector.hpp"
 #include "etl/SystemState.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockLedgerCache.hpp"
 #include "util/MockPrometheus.hpp"
 
diff --git a/tests/unit/etl/ETLStateTests.cpp b/tests/unit/etl/ETLStateTests.cpp
@@ -19,7 +19,6 @@
 
 #include "etl/ETLState.hpp"
 #include "rpc/Errors.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockSource.hpp"
 
 #include <boost/json/parse.hpp>
diff --git a/tests/unit/etl/ExtractionDataPipeTests.cpp b/tests/unit/etl/ExtractionDataPipeTests.cpp
@@ -18,7 +18,6 @@
 //==============================================================================
 
 #include "etl/impl/ExtractionDataPipe.hpp"
-#include "util/LoggerFixtures.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/tests/unit/etl/ExtractorTests.cpp b/tests/unit/etl/ExtractorTests.cpp
@@ -20,7 +20,6 @@
 #include "etl/SystemState.hpp"
 #include "etl/impl/Extractor.hpp"
 #include "util/FakeFetchResponse.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockExtractionDataPipe.hpp"
 #include "util/MockLedgerFetcher.hpp"
 #include "util/MockNetworkValidatedLedgers.hpp"
diff --git a/tests/unit/etl/GrpcSourceTests.cpp b/tests/unit/etl/GrpcSourceTests.cpp
@@ -18,7 +18,6 @@
 //==============================================================================
 
 #include "etl/impl/GrpcSource.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockBackend.hpp"
 #include "util/MockPrometheus.hpp"
 #include "util/MockXrpLedgerAPIService.hpp"
diff --git a/tests/unit/etl/NFTHelpersTests.cpp b/tests/unit/etl/NFTHelpersTests.cpp
@@ -19,7 +19,6 @@
 
 #include "data/DBHelpers.hpp"
 #include "etl/NFTHelpers.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/TestObject.hpp"
 
 #include <gtest/gtest.h>
diff --git a/tests/unit/etlng/ExtractionTests.cpp b/tests/unit/etlng/ExtractionTests.cpp
@@ -23,7 +23,6 @@
 #include "etlng/Models.hpp"
 #include "etlng/impl/Extraction.hpp"
 #include "util/BinaryTestObject.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockAssert.hpp"
 #include "util/TestObject.hpp"
 
diff --git a/tests/unit/etlng/GrpcSourceTests.cpp b/tests/unit/etlng/GrpcSourceTests.cpp
@@ -26,7 +26,6 @@
 #include "etlng/impl/GrpcSource.hpp"
 #include "util/AsioContextTestFixture.hpp"
 #include "util/Assert.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockXrpLedgerAPIService.hpp"
 #include "util/Mutex.hpp"
 #include "util/TestObject.hpp"
diff --git a/tests/unit/etlng/NetworkValidatedLedgersTests.cpp b/tests/unit/etlng/NetworkValidatedLedgersTests.cpp
@@ -20,7 +20,6 @@
 #include "etl/NetworkValidatedLedgers.hpp"
 #include "etl/NetworkValidatedLedgersInterface.hpp"
 #include "etlng/impl/AmendmentBlockHandler.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/async/context/BasicExecutionContext.hpp"
 
 #include <gmock/gmock.h>
diff --git a/tests/unit/etlng/RegistryTests.cpp b/tests/unit/etlng/RegistryTests.cpp
@@ -22,7 +22,6 @@
 #include "etlng/MonitorInterface.hpp"
 #include "etlng/impl/Registry.hpp"
 #include "util/BinaryTestObject.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockPrometheus.hpp"
 #include "util/TestObject.hpp"
 
diff --git a/tests/unit/etlng/SchedulingTests.cpp b/tests/unit/etlng/SchedulingTests.cpp
@@ -21,7 +21,6 @@
 #include "etlng/SchedulerInterface.hpp"
 #include "etlng/impl/Loading.hpp"
 #include "etlng/impl/Scheduling.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockNetworkValidatedLedgers.hpp"
 
 #include <gmock/gmock.h>
diff --git a/tests/unit/etlng/TaskManagerTests.cpp b/tests/unit/etlng/TaskManagerTests.cpp
@@ -25,7 +25,6 @@
 #include "etlng/impl/Loading.hpp"
 #include "etlng/impl/TaskManager.hpp"
 #include "util/BinaryTestObject.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/TestObject.hpp"
 #include "util/async/AnyExecutionContext.hpp"
 #include "util/async/context/BasicExecutionContext.hpp"
diff --git a/tests/unit/etlng/ext/CacheTests.cpp b/tests/unit/etlng/ext/CacheTests.cpp
@@ -21,7 +21,6 @@
 #include "etlng/impl/CacheUpdater.hpp"
 #include "etlng/impl/ext/Cache.hpp"
 #include "util/BinaryTestObject.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockLedgerCache.hpp"
 #include "util/MockPrometheus.hpp"
 #include "util/TestObject.hpp"
diff --git a/tests/unit/migration/MigrationManagerFactoryTests.cpp b/tests/unit/migration/MigrationManagerFactoryTests.cpp
@@ -18,7 +18,6 @@
 //==============================================================================
 
 #include "migration/impl/MigrationManagerFactory.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockLedgerCache.hpp"
 #include "util/config/ConfigDefinition.hpp"
 #include "util/config/ConfigValue.hpp"
diff --git a/tests/unit/migration/cassandra/FullTableScannerTests.cpp b/tests/unit/migration/cassandra/FullTableScannerTests.cpp
@@ -18,7 +18,6 @@
 //==============================================================================
 
 #include "migration/cassandra/impl/FullTableScanner.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockAssert.hpp"
 
 #include <boost/asio/spawn.hpp>
diff --git a/tests/unit/rpc/APIVersionTests.cpp b/tests/unit/rpc/APIVersionTests.cpp
@@ -18,7 +18,6 @@
 //==============================================================================
 
 #include "rpc/common/impl/APIVersionParser.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/config/ConfigDefinition.hpp"
 #include "util/config/ConfigValue.hpp"
 #include "util/config/Types.hpp"
diff --git a/tests/unit/rpc/BaseTests.cpp b/tests/unit/rpc/BaseTests.cpp
@@ -24,7 +24,6 @@
 #include "rpc/common/Types.hpp"
 #include "rpc/common/ValidationHelpers.hpp"
 #include "rpc/common/Validators.hpp"
-#include "util/LoggerFixtures.hpp"
 
 #include <boost/json/array.hpp>
 #include <boost/json/object.hpp>
diff --git a/tests/unit/rpc/CountersTests.cpp b/tests/unit/rpc/CountersTests.cpp
@@ -20,7 +20,6 @@
 #include "rpc/Counters.hpp"
 #include "rpc/JS.hpp"
 #include "rpc/WorkQueue.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockPrometheus.hpp"
 #include "util/prometheus/Counter.hpp"
 
diff --git a/tests/unit/rpc/WorkQueueTests.cpp b/tests/unit/rpc/WorkQueueTests.cpp
@@ -18,7 +18,6 @@
 //==============================================================================
 
 #include "rpc/WorkQueue.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockPrometheus.hpp"
 #include "util/config/ConfigDefinition.hpp"
 #include "util/config/ConfigValue.hpp"
diff --git a/tests/unit/util/SignalsHandlerTests.cpp b/tests/unit/util/SignalsHandlerTests.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include "util/LoggerFixtures.hpp"
 #include "util/MockAssert.hpp"
 #include "util/SignalsHandler.hpp"
 #include "util/config/ConfigDefinition.hpp"
diff --git a/tests/unit/util/config/ClioConfigDefinitionTests.cpp b/tests/unit/util/config/ClioConfigDefinitionTests.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include "util/LoggerFixtures.hpp"
 #include "util/MockAssert.hpp"
 #include "util/config/Array.hpp"
 #include "util/config/ArrayView.hpp"
diff --git a/tests/unit/util/config/ConfigFileJsonTests.cpp b/tests/unit/util/config/ConfigFileJsonTests.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include "util/LoggerFixtures.hpp"
 #include "util/MockAssert.hpp"
 #include "util/NameGenerator.hpp"
 #include "util/OverloadSet.hpp"
diff --git a/tests/unit/util/config/ConfigValueTests.cpp b/tests/unit/util/config/ConfigValueTests.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include "util/LoggerFixtures.hpp"
 #include "util/MockAssert.hpp"
 #include "util/config/ConfigConstraints.hpp"
 #include "util/config/ConfigValue.hpp"
diff --git a/tests/unit/util/log/LogServiceInitTests.cpp b/tests/unit/util/log/LogServiceInitTests.cpp
@@ -33,9 +33,6 @@
 #include <fmt/format.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <spdlog/pattern_formatter.h>
-#include <spdlog/sinks/ostream_sink.h>
-#include <spdlog/spdlog.h>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/tests/unit/web/AdminVerificationTests.cpp b/tests/unit/web/AdminVerificationTests.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include "util/LoggerFixtures.hpp"
 #include "util/NameGenerator.hpp"
 #include "util/config/ConfigDefinition.hpp"
 #include "util/config/ConfigFileJson.hpp"
diff --git a/tests/unit/web/ServerTests.cpp b/tests/unit/web/ServerTests.cpp
@@ -18,7 +18,6 @@
 //==============================================================================
 
 #include "util/AssignRandomPort.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockPrometheus.hpp"
 #include "util/TestHttpClient.hpp"
 #include "util/TestWebSocketClient.hpp"
diff --git a/tests/unit/web/SubscriptionContextTests.cpp b/tests/unit/web/SubscriptionContextTests.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include "util/LoggerFixtures.hpp"
 #include "util/Taggable.hpp"
 #include "util/config/ConfigDefinition.hpp"
 #include "util/config/ConfigValue.hpp"
diff --git a/tests/unit/web/dosguard/DOSGuardTests.cpp b/tests/unit/web/dosguard/DOSGuardTests.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include "util/LoggerFixtures.hpp"
 #include "util/config/Array.hpp"
 #include "util/config/ConfigDefinition.hpp"
 #include "util/config/ConfigValue.hpp"
diff --git a/tests/unit/web/dosguard/WhitelistHandlerTests.cpp b/tests/unit/web/dosguard/WhitelistHandlerTests.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include "util/LoggerFixtures.hpp"
 #include "util/config/Array.hpp"
 #include "util/config/ConfigDefinition.hpp"
 #include "util/config/ConfigFileJson.hpp"
diff --git a/tests/unit/web/impl/ErrorHandlingTests.cpp b/tests/unit/web/impl/ErrorHandlingTests.cpp
@@ -18,7 +18,6 @@
 //==============================================================================
 
 #include "rpc/Errors.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/NameGenerator.hpp"
 #include "util/Taggable.hpp"
 #include "util/config/ConfigDefinition.hpp"
diff --git a/tests/unit/web/ng/ServerTests.cpp b/tests/unit/web/ng/ServerTests.cpp
@@ -19,7 +19,6 @@
 
 #include "util/AsioContextTestFixture.hpp"
 #include "util/AssignRandomPort.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/MockPrometheus.hpp"
 #include "util/NameGenerator.hpp"
 #include "util/Spawn.hpp"
diff --git a/tests/unit/web/ng/impl/ErrorHandlingTests.cpp b/tests/unit/web/ng/impl/ErrorHandlingTests.cpp
@@ -18,7 +18,6 @@
 //==============================================================================
 
 #include "rpc/Errors.hpp"
-#include "util/LoggerFixtures.hpp"
 #include "util/NameGenerator.hpp"
 #include "web/ng/Request.hpp"
 #include "web/ng/impl/ErrorHandling.hpp"
diff --git a/tests/unit/web/ng/impl/WsConnectionTests.cpp b/tests/unit/web/ng/impl/WsConnectionTests.cpp
@@ -46,7 +46,6 @@
 #include <chrono>
 #include <cstddef>
 #include <memory>
-#include <optional>
 #include <ranges>
 #include <string>
 #include <thread>
