From 69f5025a29e164a948b47ff2658be96d68096a39 Mon Sep 17 00:00:00 2001 From: Sergey Kuznetsov Date: Mon, 2 Oct 2023 16:45:48 +0100 Subject: [PATCH] Add compiler flags (#850) Fixes #435 --- CMake/Settings.cmake | 38 ++++++- src/data/CassandraBackend.h | 6 +- src/data/DBHelpers.h | 2 +- src/data/LedgerCache.cpp | 4 +- src/data/Types.h | 2 + src/data/cassandra/impl/Cluster.h | 2 +- src/data/cassandra/impl/ManagedObject.h | 2 +- src/etl/ETLService.cpp | 101 ++++++++++-------- src/etl/ETLService.h | 9 ++ src/etl/LoadBalancer.cpp | 4 +- src/etl/ProbingSource.cpp | 4 +- src/etl/impl/AsyncData.h | 2 +- src/etl/impl/LedgerLoader.h | 5 +- src/main/Main.cpp | 2 +- src/rpc/BookChangesHelper.h | 1 + src/rpc/Factories.cpp | 4 - src/rpc/RPCEngine.h | 5 +- src/rpc/RPCHelpers.cpp | 23 ++-- src/rpc/common/Types.h | 4 +- src/rpc/common/Validators.cpp | 2 +- src/rpc/handlers/LedgerEntry.h | 2 +- src/rpc/handlers/NFTOffersCommon.cpp | 2 +- src/rpc/handlers/NFTOffersCommon.h | 8 +- src/web/RPCServerHandler.h | 16 +-- src/web/impl/WsBase.h | 2 +- src/web/interface/ConnectionBase.h | 3 +- unittests/SubscriptionManagerTests.cpp | 2 +- unittests/SubscriptionTests.cpp | 13 ++- unittests/data/cassandra/BackendTests.cpp | 98 +++++++++-------- unittests/data/cassandra/BaseTests.cpp | 29 ++--- .../data/cassandra/ExecutionStrategyTests.cpp | 2 +- unittests/data/cassandra/impl/FakesAndMocks.h | 3 +- unittests/etl/ExtractorTests.cpp | 12 +-- unittests/rpc/BaseTests.cpp | 2 +- unittests/rpc/ForwardingProxyTests.cpp | 36 +++---- unittests/rpc/WorkQueueTests.cpp | 4 +- .../rpc/handlers/AccountCurrenciesTests.cpp | 15 +-- unittests/rpc/handlers/AccountLinesTests.cpp | 36 +++---- .../rpc/handlers/AccountObjectsTests.cpp | 48 +++------ unittests/rpc/handlers/BookOffersTests.cpp | 6 +- .../rpc/handlers/GatewayBalancesTests.cpp | 53 +++++---- unittests/rpc/handlers/LedgerDataTests.cpp | 26 ++--- unittests/rpc/handlers/LedgerEntryTests.cpp | 2 +- unittests/rpc/handlers/LedgerTests.cpp | 5 +- unittests/rpc/handlers/NoRippleCheckTests.cpp | 36 +++---- unittests/rpc/handlers/ServerInfoTests.cpp | 39 ++++--- unittests/rpc/handlers/UnsubscribeTests.cpp | 15 +-- unittests/util/MockWsBase.h | 7 +- unittests/util/StringUtils.cpp | 2 +- unittests/util/TestHttpSyncClient.h | 11 +- unittests/util/TestObject.cpp | 1 - unittests/util/TestObject.h | 1 - unittests/web/ServerTests.cpp | 6 +- 53 files changed, 383 insertions(+), 382 deletions(-) diff --git a/CMake/Settings.cmake b/CMake/Settings.cmake index 0489bd5d..42180fd6 100644 --- a/CMake/Settings.cmake +++ b/CMake/Settings.cmake @@ -1,7 +1,39 @@ -target_compile_options (clio PUBLIC +set(COMPILER_FLAGS -Wall + -Wcast-align + -Wdouble-promotion + -Wextra -Werror + -Wformat=2 + -Wimplicit-fallthrough + -Wmisleading-indentation -Wno-narrowing - -Wno-deprecated-declarations + -Wno-deprecated-declarations -Wno-dangling-else - -Wno-unused-but-set-variable) + -Wno-unused-but-set-variable + -Wnon-virtual-dtor + -Wnull-dereference + -Wold-style-cast + -pedantic + -Wpedantic + -Wunused +) + +if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + list(APPEND COMPILER_FLAGS + -Wshadow # gcc is to aggressive with shadowing https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78147 + ) +endif () + +if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + list(APPEND COMPILER_FLAGS + -Wduplicated-branches + -Wduplicated-cond + -Wlogical-op + -Wuseless-cast + ) +endif () + +# See https://github.com/cpp-best-practices/cppbestpractices/blob/master/02-Use_the_Tools_Available.md#gcc--clang for the flags description + +target_compile_options (clio PUBLIC ${COMPILER_FLAGS}) diff --git a/src/data/CassandraBackend.h b/src/data/CassandraBackend.h index c9ab5272..dd22de5b 100644 --- a/src/data/CassandraBackend.h +++ b/src/data/CassandraBackend.h @@ -649,11 +649,11 @@ public: return {}; } - std::vector keys; + std::vector resultKeys; for (auto [key] : extract(results)) - keys.push_back(key); + resultKeys.push_back(key); - return keys; + return resultKeys; }); // one of the above errors must have happened diff --git a/src/data/DBHelpers.h b/src/data/DBHelpers.h index 85139b24..0e164c03 100644 --- a/src/data/DBHelpers.h +++ b/src/data/DBHelpers.h @@ -40,7 +40,7 @@ struct AccountTransactionsData std::uint32_t transactionIndex; ripple::uint256 txHash; - AccountTransactionsData(ripple::TxMeta& meta, ripple::uint256 const& txHash, beast::Journal& j) + AccountTransactionsData(ripple::TxMeta& meta, ripple::uint256 const& txHash) : accounts(meta.getAffectedAccounts()) , ledgerSequence(meta.getLgrSeq()) , transactionIndex(meta.getIndex()) diff --git a/src/data/LedgerCache.cpp b/src/data/LedgerCache.cpp index 0b976d4b..731d6606 100644 --- a/src/data/LedgerCache.cpp +++ b/src/data/LedgerCache.cpp @@ -146,7 +146,7 @@ LedgerCache::getObjectHitRate() const { if (!objectReqCounter_) return 1; - return ((float)objectHitCounter_) / objectReqCounter_; + return static_cast(objectHitCounter_) / objectReqCounter_; } float @@ -154,7 +154,7 @@ LedgerCache::getSuccessorHitRate() const { if (!successorReqCounter_) return 1; - return ((float)successorHitCounter_) / successorReqCounter_; + return static_cast(successorHitCounter_) / successorReqCounter_; } } // namespace data diff --git a/src/data/Types.h b/src/data/Types.h index 5d973dc6..02b12475 100644 --- a/src/data/Types.h +++ b/src/data/Types.h @@ -118,6 +118,8 @@ struct TransactionsCursor { } + TransactionsCursor(TransactionsCursor const&) = default; + TransactionsCursor& operator=(TransactionsCursor const&) = default; diff --git a/src/data/cassandra/impl/Cluster.h b/src/data/cassandra/impl/Cluster.h index 913ca389..4c9b852c 100644 --- a/src/data/cassandra/impl/Cluster.h +++ b/src/data/cassandra/impl/Cluster.h @@ -46,7 +46,7 @@ struct Settings struct ContactPoints { std::string contactPoints = "127.0.0.1"; // defaults to localhost - std::optional port; + std::optional port = {}; }; /** diff --git a/src/data/cassandra/impl/ManagedObject.h b/src/data/cassandra/impl/ManagedObject.h index e54e3a40..ae73af36 100644 --- a/src/data/cassandra/impl/ManagedObject.h +++ b/src/data/cassandra/impl/ManagedObject.h @@ -38,7 +38,7 @@ public: } ManagedObject(ManagedObject&&) = default; - operator Managed* const() const + operator Managed*() const { return ptr_.get(); } diff --git a/src/etl/ETLService.cpp b/src/etl/ETLService.cpp index faa5495b..40333a04 100644 --- a/src/etl/ETLService.cpp +++ b/src/etl/ETLService.cpp @@ -142,43 +142,50 @@ ETLService::monitor() while (true) { - if (auto rng = backend_->hardFetchLedgerRangeNoThrow(); rng && rng->maxSequence >= nextSequence) + nextSequence = publishNextSequence(nextSequence); + } +} + +uint32_t +ETLService::publishNextSequence(uint32_t nextSequence) +{ + if (auto rng = backend_->hardFetchLedgerRangeNoThrow(); rng && rng->maxSequence >= nextSequence) + { + ledgerPublisher_.publish(nextSequence, {}); + ++nextSequence; + } + else if (networkValidatedLedgers_->waitUntilValidatedByNetwork(nextSequence, 1000)) + { + LOG(log_.info()) << "Ledger with sequence = " << nextSequence << " has been validated by the network. " + << "Attempting to find in database and publish"; + + // Attempt to take over responsibility of ETL writer after 10 failed + // attempts to publish the ledger. publishLedger() fails if the + // ledger that has been validated by the network is not found in the + // database after the specified number of attempts. publishLedger() + // waits one second between each attempt to read the ledger from the + // database + constexpr size_t timeoutSeconds = 10; + bool success = ledgerPublisher_.publish(nextSequence, timeoutSeconds); + + if (!success) + { + LOG(log_.warn()) << "Failed to publish ledger with sequence = " << nextSequence << " . Beginning ETL"; + + // returns the most recent sequence published empty optional if no sequence was published + std::optional lastPublished = runETLPipeline(nextSequence, extractorThreads_); + LOG(log_.info()) << "Aborting ETL. Falling back to publishing"; + + // if no ledger was published, don't increment nextSequence + if (lastPublished) + nextSequence = *lastPublished + 1; + } + else { - ledgerPublisher_.publish(nextSequence, {}); ++nextSequence; } - else if (networkValidatedLedgers_->waitUntilValidatedByNetwork(nextSequence, 1000)) - { - LOG(log_.info()) << "Ledger with sequence = " << nextSequence << " has been validated by the network. " - << "Attempting to find in database and publish"; - - // Attempt to take over responsibility of ETL writer after 10 failed - // attempts to publish the ledger. publishLedger() fails if the - // ledger that has been validated by the network is not found in the - // database after the specified number of attempts. publishLedger() - // waits one second between each attempt to read the ledger from the - // database - constexpr size_t timeoutSeconds = 10; - bool success = ledgerPublisher_.publish(nextSequence, timeoutSeconds); - - if (!success) - { - LOG(log_.warn()) << "Failed to publish ledger with sequence = " << nextSequence << " . Beginning ETL"; - - // returns the most recent sequence published empty optional if no sequence was published - std::optional lastPublished = runETLPipeline(nextSequence, extractorThreads_); - LOG(log_.info()) << "Aborting ETL. Falling back to publishing"; - - // if no ledger was published, don't increment nextSequence - if (lastPublished) - nextSequence = *lastPublished + 1; - } - else - { - ++nextSequence; - } - } } + return nextSequence; } void @@ -186,21 +193,29 @@ ETLService::monitorReadOnly() { LOG(log_.debug()) << "Starting reporting in strict read only mode"; - auto rng = backend_->hardFetchLedgerRangeNoThrow(); - uint32_t latestSequence; + const auto latestSequenceOpt = [this]() -> std::optional { + auto rng = backend_->hardFetchLedgerRangeNoThrow(); - if (!rng) - { - if (auto net = networkValidatedLedgers_->getMostRecent()) - latestSequence = *net; + if (!rng) + { + if (auto net = networkValidatedLedgers_->getMostRecent()) + return *net; + else + return std::nullopt; + } else - return; - } - else + { + return rng->maxSequence; + } + }(); + + if (!latestSequenceOpt.has_value()) { - latestSequence = rng->maxSequence; + return; } + uint32_t latestSequence = *latestSequenceOpt; + cacheLoader_.load(latestSequence); latestSequence++; diff --git a/src/etl/ETLService.h b/src/etl/ETLService.h index 2da38026..5f61a902 100644 --- a/src/etl/ETLService.h +++ b/src/etl/ETLService.h @@ -230,6 +230,15 @@ private: void monitor(); + /** + * @brief Monitor the network for newly validated ledgers and publish them to the ledgers stream + * + * @param nextSequence the ledger sequence to publish + * @return the next ledger sequence to publish + */ + uint32_t + publishNextSequence(uint32_t nextSequence); + /** * @brief Monitor the database for newly written ledgers. * diff --git a/src/etl/LoadBalancer.cpp b/src/etl/LoadBalancer.cpp index 691d64f6..2605e06f 100644 --- a/src/etl/LoadBalancer.cpp +++ b/src/etl/LoadBalancer.cpp @@ -147,7 +147,7 @@ LoadBalancer::forwardToRippled( std::string const& clientIp, boost::asio::yield_context yield) const { - srand((unsigned)time(0)); + srand(static_cast(time(0))); auto sourceIdx = rand() % sources_.size(); auto numAttempts = 0u; @@ -193,7 +193,7 @@ template bool LoadBalancer::execute(Func f, uint32_t ledgerSequence) { - srand((unsigned)time(0)); + srand(static_cast(time(0))); auto sourceIdx = rand() % sources_.size(); auto numAttempts = 0; diff --git a/src/etl/ProbingSource.cpp b/src/etl/ProbingSource.cpp index 923f241b..8fbcdbf3 100644 --- a/src/etl/ProbingSource.cpp +++ b/src/etl/ProbingSource.cpp @@ -160,7 +160,7 @@ ProbingSource::make_SSLHooks() noexcept return SourceHooks::Action::PROCEED; }, // onDisconnected - [this](auto ec) { + [this](auto /* ec */) { std::lock_guard lck(mtx_); if (currentSrc_) { @@ -189,7 +189,7 @@ ProbingSource::make_PlainHooks() noexcept return SourceHooks::Action::PROCEED; }, // onDisconnected - [this](auto ec) { + [this](auto /* ec */) { std::lock_guard lck(mtx_); if (currentSrc_) { diff --git a/src/etl/impl/AsyncData.h b/src/etl/impl/AsyncData.h index 7d915d1f..053a44b7 100644 --- a/src/etl/impl/AsyncData.h +++ b/src/etl/impl/AsyncData.h @@ -128,7 +128,7 @@ public: auto& obj = *(cur_->mutable_ledger_objects()->mutable_objects(i)); if (!more && nextPrefix_ != 0x00) { - if (((unsigned char)obj.key()[0]) >= nextPrefix_) + if (static_cast(obj.key()[0]) >= nextPrefix_) continue; } cacheUpdates.push_back( diff --git a/src/etl/impl/LedgerLoader.h b/src/etl/impl/LedgerLoader.h index 5c79e361..1a6552ee 100644 --- a/src/etl/impl/LedgerLoader.h +++ b/src/etl/impl/LedgerLoader.h @@ -107,9 +107,8 @@ public: if (maybeNFT) result.nfTokensData.push_back(*maybeNFT); - auto journal = ripple::debugLog(); - result.accountTxData.emplace_back(txMeta, sttx.getTransactionID(), journal); - std::string keyStr{(const char*)sttx.getTransactionID().data(), 32}; + result.accountTxData.emplace_back(txMeta, sttx.getTransactionID()); + std::string keyStr{reinterpret_cast(sttx.getTransactionID().data()), 32}; backend_->writeTransaction( std::move(keyStr), ledger.seq, diff --git a/src/main/Main.cpp b/src/main/Main.cpp index e4008ee5..2228c9b5 100644 --- a/src/main/Main.cpp +++ b/src/main/Main.cpp @@ -206,7 +206,7 @@ try auto const handlerProvider = std::make_shared( config, backend, subscriptions, balancer, etl, counters); auto const rpcEngine = rpc::RPCEngine::make_RPCEngine( - config, backend, subscriptions, balancer, etl, dosGuard, workQueue, counters, handlerProvider); + backend, subscriptions, balancer, dosGuard, workQueue, counters, handlerProvider); // Init the web server auto handler = std::make_shared>( diff --git a/src/rpc/BookChangesHelper.h b/src/rpc/BookChangesHelper.h index 49cc4337..7733ea52 100644 --- a/src/rpc/BookChangesHelper.h +++ b/src/rpc/BookChangesHelper.h @@ -199,6 +199,7 @@ private: case ripple::ttOFFER_CREATE: if (tx->isFieldPresent(ripple::sfOfferSequence)) return tx->getFieldU32(ripple::sfOfferSequence); + [[fallthrough]]; default: return std::nullopt; } diff --git a/src/rpc/Factories.cpp b/src/rpc/Factories.cpp index 8c58b553..8a3f2bc6 100644 --- a/src/rpc/Factories.cpp +++ b/src/rpc/Factories.cpp @@ -35,8 +35,6 @@ make_WsContext( string const& clientIp, std::reference_wrapper apiVersionParser) { - using Error = Unexpected; - boost::json::value commandValue = nullptr; if (!request.contains("command") && request.contains("method")) commandValue = request.at("method"); @@ -63,8 +61,6 @@ make_HttpContext( string const& clientIp, std::reference_wrapper apiVersionParser) { - using Error = Unexpected; - if (!request.contains("method")) return Error{{ClioError::rpcCOMMAND_IS_MISSING}}; diff --git a/src/rpc/RPCEngine.h b/src/rpc/RPCEngine.h index 2e7c96a1..f4f340ce 100644 --- a/src/rpc/RPCEngine.h +++ b/src/rpc/RPCEngine.h @@ -83,7 +83,6 @@ public: std::shared_ptr const& backend, std::shared_ptr const& subscriptions, std::shared_ptr const& balancer, - std::shared_ptr const& etl, web::DOSGuard const& dosGuard, WorkQueue& workQueue, Counters& counters, @@ -101,18 +100,16 @@ public: static std::shared_ptr make_RPCEngine( - util::Config const& config, std::shared_ptr const& backend, std::shared_ptr const& subscriptions, std::shared_ptr const& balancer, - std::shared_ptr const& etl, web::DOSGuard const& dosGuard, WorkQueue& workQueue, Counters& counters, std::shared_ptr const& handlerProvider) { return std::make_shared( - backend, subscriptions, balancer, etl, dosGuard, workQueue, counters, handlerProvider); + backend, subscriptions, balancer, dosGuard, workQueue, counters, handlerProvider); } /** diff --git a/src/rpc/RPCHelpers.cpp b/src/rpc/RPCHelpers.cpp index b5b3aa5b..f583b764 100644 --- a/src/rpc/RPCHelpers.cpp +++ b/src/rpc/RPCHelpers.cpp @@ -33,6 +33,7 @@ // local to compilation unit loggers namespace { util::Logger gLog{"RPC"}; + } // namespace namespace rpc { @@ -565,10 +566,10 @@ traverseOwnedNodes( if (!hintDir) return Status(ripple::rpcINVALID_PARAMS, "Invalid marker."); - ripple::SerialIter it{hintDir->data(), hintDir->size()}; - ripple::SLE sle{it, hintIndex.key}; + ripple::SerialIter hintDirIt{hintDir->data(), hintDir->size()}; + ripple::SLE hintDirSle{hintDirIt, hintIndex.key}; - if (auto const& indexes = sle.getFieldV256(ripple::sfIndexes); + if (auto const& indexes = hintDirSle.getFieldV256(ripple::sfIndexes); std::find(std::begin(indexes), std::end(indexes), hexMarker) == std::end(indexes)) { // the index specified by marker is not in the page specified by marker @@ -584,10 +585,10 @@ traverseOwnedNodes( if (!ownerDir) return Status(ripple::rpcINVALID_PARAMS, "Owner directory not found."); - ripple::SerialIter it{ownerDir->data(), ownerDir->size()}; - ripple::SLE sle{it, currentIndex.key}; + ripple::SerialIter ownedDirIt{ownerDir->data(), ownerDir->size()}; + ripple::SLE ownedDirSle{ownedDirIt, currentIndex.key}; - for (auto const& key : sle.getFieldV256(ripple::sfIndexes)) + for (auto const& key : ownedDirSle.getFieldV256(ripple::sfIndexes)) { if (!found) { @@ -611,7 +612,7 @@ traverseOwnedNodes( break; } // the next page - auto const uNodeNext = sle.getFieldU64(ripple::sfIndexNext); + auto const uNodeNext = ownedDirSle.getFieldU64(ripple::sfIndexNext); if (uNodeNext == 0) break; @@ -628,10 +629,10 @@ traverseOwnedNodes( if (!ownerDir) break; - ripple::SerialIter it{ownerDir->data(), ownerDir->size()}; - ripple::SLE sle{it, currentIndex.key}; + ripple::SerialIter ownedDirIt{ownerDir->data(), ownerDir->size()}; + ripple::SLE ownedDirSle{ownedDirIt, currentIndex.key}; - for (auto const& key : sle.getFieldV256(ripple::sfIndexes)) + for (auto const& key : ownedDirSle.getFieldV256(ripple::sfIndexes)) { keys.push_back(key); @@ -645,7 +646,7 @@ traverseOwnedNodes( break; } - auto const uNodeNext = sle.getFieldU64(ripple::sfIndexNext); + auto const uNodeNext = ownedDirSle.getFieldU64(ripple::sfIndexNext); if (uNodeNext == 0) break; diff --git a/src/rpc/common/Types.h b/src/rpc/common/Types.h index e2519eac..47738d1c 100644 --- a/src/rpc/common/Types.h +++ b/src/rpc/common/Types.h @@ -83,9 +83,9 @@ struct VoidOutput struct Context { boost::asio::yield_context yield; - std::shared_ptr session; + std::shared_ptr session = {}; bool isAdmin = false; - std::string clientIp; + std::string clientIp = {}; uint32_t apiVersion = 0u; // invalid by default }; diff --git a/src/rpc/common/Validators.cpp b/src/rpc/common/Validators.cpp index 35fca1c0..8323e9dc 100644 --- a/src/rpc/common/Validators.cpp +++ b/src/rpc/common/Validators.cpp @@ -68,7 +68,7 @@ CustomValidator Uint256HexStringValidator = }}; CustomValidator LedgerIndexValidator = - CustomValidator{[](boost::json::value const& value, std::string_view key) -> MaybeError { + CustomValidator{[](boost::json::value const& value, std::string_view /* key */) -> MaybeError { auto err = Error{Status{RippledError::rpcINVALID_PARAMS, "ledgerIndexMalformed"}}; if (!value.is_string() && !(value.is_uint64() || value.is_int64())) diff --git a/src/rpc/handlers/LedgerEntry.h b/src/rpc/handlers/LedgerEntry.h index 3c2deea2..09cfb58a 100644 --- a/src/rpc/handlers/LedgerEntry.h +++ b/src/rpc/handlers/LedgerEntry.h @@ -81,7 +81,7 @@ public: // The accounts array must have two different elements // Each element must be a valid address static auto const rippleStateAccountsCheck = - validation::CustomValidator{[](boost::json::value const& value, std::string_view key) -> MaybeError { + validation::CustomValidator{[](boost::json::value const& value, std::string_view /* key */) -> MaybeError { if (!value.is_array() || value.as_array().size() != 2 || !value.as_array()[0].is_string() || !value.as_array()[1].is_string() || value.as_array()[0].as_string() == value.as_array()[1].as_string()) diff --git a/src/rpc/handlers/NFTOffersCommon.cpp b/src/rpc/handlers/NFTOffersCommon.cpp index 9eb1a801..28076f2a 100644 --- a/src/rpc/handlers/NFTOffersCommon.cpp +++ b/src/rpc/handlers/NFTOffersCommon.cpp @@ -132,7 +132,7 @@ NFTOffersHandlerBase::iterateOfferDirectory( std::move(std::begin(offers), std::end(offers), std::back_inserter(output.offers)); - return std::move(output); + return output; } void diff --git a/src/rpc/handlers/NFTOffersCommon.h b/src/rpc/handlers/NFTOffersCommon.h index 555c5674..86476709 100644 --- a/src/rpc/handlers/NFTOffersCommon.h +++ b/src/rpc/handlers/NFTOffersCommon.h @@ -38,13 +38,13 @@ public: struct Output { - std::string nftID; - std::vector offers; + std::string nftID = {}; + std::vector offers = {}; // validated should be sent via framework bool validated = true; - std::optional limit; - std::optional marker; + std::optional limit = {}; + std::optional marker = {}; }; struct Input diff --git a/src/web/RPCServerHandler.h b/src/web/RPCServerHandler.h index 0572ac15..764c201f 100644 --- a/src/web/RPCServerHandler.h +++ b/src/web/RPCServerHandler.h @@ -190,13 +190,13 @@ private: return web::detail::ErrorHelper(connection, request).sendError(err); } - auto [v, timeDiff] = util::timed([&]() { return rpcEngine_->buildResponse(*context); }); + auto [result, timeDiff] = util::timed([&]() { return rpcEngine_->buildResponse(*context); }); auto us = std::chrono::duration(timeDiff); rpc::logDuration(*context, us); boost::json::object response; - if (auto const status = std::get_if(&v)) + if (auto const status = std::get_if(&result)) { // note: error statuses are counted/notified in buildResponse itself response = web::detail::ErrorHelper(connection, request).composeError(*status); @@ -210,20 +210,20 @@ private: // This can still technically be an error. Clio counts forwarded requests as successful. rpcEngine_->notifyComplete(context->method, us); - auto& result = std::get(v); - auto const isForwarded = result.contains("forwarded") && result.at("forwarded").is_bool() && - result.at("forwarded").as_bool(); + auto& json = std::get(result); + auto const isForwarded = + json.contains("forwarded") && json.at("forwarded").is_bool() && json.at("forwarded").as_bool(); // if the result is forwarded - just use it as is // if forwarded request has error, for http, error should be in "result"; for ws, error should be at top - if (isForwarded && (result.contains("result") || connection->upgraded)) + if (isForwarded && (json.contains("result") || connection->upgraded)) { - for (auto const& [k, v] : result) + for (auto const& [k, v] : json) response.insert_or_assign(k, v); } else { - response["result"] = result; + response["result"] = json; } // for ws there is an additional field "status" in the response, diff --git a/src/web/impl/WsBase.h b/src/web/impl/WsBase.h index a1e1ad9c..e1e51d85 100644 --- a/src/web/impl/WsBase.h +++ b/src/web/impl/WsBase.h @@ -150,7 +150,7 @@ public: * If the DOSGuard is triggered, the message will be modified to include a warning */ void - send(std::string&& msg, http::status _ = http::status::ok) override + send(std::string&& msg, http::status = http::status::ok) override { if (!dosGuard_.get().add(clientIp, msg.size())) { diff --git a/src/web/interface/ConnectionBase.h b/src/web/interface/ConnectionBase.h index ae05c49d..1bbabb62 100644 --- a/src/web/interface/ConnectionBase.h +++ b/src/web/interface/ConnectionBase.h @@ -68,8 +68,7 @@ public: * @param msg The message to send * @throws Not supported unless implemented in child classes. Will always throw std::logic_error. */ - virtual void - send(std::shared_ptr msg) + virtual void send(std::shared_ptr /* msg */) { throw std::logic_error("web server can not send the shared payload"); } diff --git a/unittests/SubscriptionManagerTests.cpp b/unittests/SubscriptionManagerTests.cpp index ffa527a9..5e053961 100644 --- a/unittests/SubscriptionManagerTests.cpp +++ b/unittests/SubscriptionManagerTests.cpp @@ -270,7 +270,7 @@ TEST_F(SubscriptionManagerSimpleBackendTest, SubscriptionManagerAccountProposedT })"; subManagerPtr->forwardProposedTransaction(json::parse(dummyTransaction).get_object()); CheckSubscriberMessage(dummyTransaction, session); - auto rawIdle = (MockSession*)(sessionIdle.get()); + auto rawIdle = static_cast(sessionIdle.get()); EXPECT_EQ("", rawIdle->message); } diff --git a/unittests/SubscriptionTests.cpp b/unittests/SubscriptionTests.cpp index f9a4be08..c0f0ecf8 100644 --- a/unittests/SubscriptionTests.cpp +++ b/unittests/SubscriptionTests.cpp @@ -25,7 +25,6 @@ #include #include -namespace json = boost::json; using namespace feed; // io_context @@ -83,9 +82,9 @@ TEST_F(SubscriptionTest, SubscriptionPublish) sub.publish(std::make_shared("message")); ctx.restart(); ctx.run(); - MockSession* p1 = (MockSession*)(session1.get()); + MockSession* p1 = static_cast(session1.get()); EXPECT_EQ(p1->message, "message"); - MockSession* p2 = (MockSession*)(session2.get()); + MockSession* p2 = static_cast(session2.get()); EXPECT_EQ(p2->message, "message"); sub.unsubscribe(session1); ctx.restart(); @@ -166,9 +165,9 @@ TEST_F(SubscriptionMapTest, SubscriptionMapPublish) subMap.publish(std::make_shared(topic2Message.data()), topic2); // rvalue ctx.restart(); ctx.run(); - MockSession* p1 = (MockSession*)(session1.get()); + MockSession* p1 = static_cast(session1.get()); EXPECT_EQ(p1->message, topic1Message); - MockSession* p2 = (MockSession*)(session2.get()); + MockSession* p2 = static_cast(session2.get()); EXPECT_EQ(p2->message, topic2Message); } @@ -190,9 +189,9 @@ TEST_F(SubscriptionMapTest, SubscriptionMapDeadRemoveSubscriber) subMap.publish(std::make_shared(topic2Message), topic2); // rvalue ctx.restart(); ctx.run(); - MockDeadSession* p1 = (MockDeadSession*)(session1.get()); + MockDeadSession* p1 = static_cast(session1.get()); EXPECT_EQ(p1->dead(), true); - MockSession* p2 = (MockSession*)(session2.get()); + MockSession* p2 = static_cast(session2.get()); EXPECT_EQ(p2->message, topic2Message); subMap.publish(message1, topic1); ctx.restart(); diff --git a/unittests/data/cassandra/BackendTests.cpp b/unittests/data/cassandra/BackendTests.cpp index 4390255d..42fd00e1 100644 --- a/unittests/data/cassandra/BackendTests.cpp +++ b/unittests/data/cassandra/BackendTests.cpp @@ -122,9 +122,9 @@ TEST_F(BackendCassandraTest, Basic) lgrInfoNext.hash++; lgrInfoNext.accountHash = ~lgrInfo.accountHash; { - std::string rawHeaderBlob = ledgerInfoToBinaryString(lgrInfoNext); + std::string infoBlob = ledgerInfoToBinaryString(lgrInfoNext); - backend->writeLedger(lgrInfoNext, std::move(rawHeaderBlob)); + backend->writeLedger(lgrInfoNext, std::move(infoBlob)); ASSERT_TRUE(backend->finishWrites(lgrInfoNext.seq)); } { @@ -349,14 +349,13 @@ TEST_F(BackendCassandraTest, Basic) ripple::uint256 hash256; EXPECT_TRUE(hash256.parseHex(hashHex)); ripple::TxMeta txMeta{hash256, lgrInfoNext.seq, metaBlob}; - auto journal = ripple::debugLog(); auto accountsSet = txMeta.getAffectedAccounts(); for (auto& a : accountsSet) { affectedAccounts.push_back(a); } std::vector accountTxData; - accountTxData.emplace_back(txMeta, hash256, journal); + accountTxData.emplace_back(txMeta, hash256); ripple::uint256 nftHash256; EXPECT_TRUE(nftHash256.parseHex(nftTxnHashHex)); @@ -399,18 +398,22 @@ TEST_F(BackendCassandraTest, Basic) auto retLgr = backend->fetchLedgerBySequence(lgrInfoNext.seq, yield); EXPECT_TRUE(retLgr); EXPECT_EQ(ledgerInfoToBlob(*retLgr), ledgerInfoToBlob(lgrInfoNext)); - auto txns = backend->fetchAllTransactionsInLedger(lgrInfoNext.seq, yield); - ASSERT_EQ(txns.size(), 1); - EXPECT_STREQ((const char*)txns[0].transaction.data(), (const char*)txnBlob.data()); - EXPECT_STREQ((const char*)txns[0].metadata.data(), (const char*)metaBlob.data()); + auto allTransactions = backend->fetchAllTransactionsInLedger(lgrInfoNext.seq, yield); + ASSERT_EQ(allTransactions.size(), 1); + EXPECT_STREQ( + reinterpret_cast(allTransactions[0].transaction.data()), + static_cast(txnBlob.data())); + EXPECT_STREQ( + reinterpret_cast(allTransactions[0].metadata.data()), + static_cast(metaBlob.data())); auto hashes = backend->fetchAllTransactionHashesInLedger(lgrInfoNext.seq, yield); EXPECT_EQ(hashes.size(), 1); EXPECT_EQ(ripple::strHex(hashes[0]), hashHex); for (auto& a : affectedAccounts) { - auto [txns, cursor] = backend->fetchAccountTransactions(a, 100, true, {}, yield); - EXPECT_EQ(txns.size(), 1); - EXPECT_EQ(txns[0], txns[0]); + auto [accountTransactions, cursor] = backend->fetchAccountTransactions(a, 100, true, {}, yield); + EXPECT_EQ(accountTransactions.size(), 1); + EXPECT_EQ(accountTransactions[0], accountTransactions[0]); EXPECT_FALSE(cursor); } auto nft = backend->fetchNFT(nftID, lgrInfoNext.seq, yield); @@ -424,10 +427,10 @@ TEST_F(BackendCassandraTest, Basic) EXPECT_TRUE(key256.parseHex(accountIndexHex)); auto obj = backend->fetchLedgerObject(key256, lgrInfoNext.seq, yield); EXPECT_TRUE(obj); - EXPECT_STREQ((const char*)obj->data(), (const char*)accountBlob.data()); + EXPECT_STREQ(reinterpret_cast(obj->data()), static_cast(accountBlob.data())); obj = backend->fetchLedgerObject(key256, lgrInfoNext.seq + 1, yield); EXPECT_TRUE(obj); - EXPECT_STREQ((const char*)obj->data(), (const char*)accountBlob.data()); + EXPECT_STREQ(reinterpret_cast(obj->data()), static_cast(accountBlob.data())); obj = backend->fetchLedgerObject(key256, lgrInfoOld.seq - 1, yield); EXPECT_FALSE(obj); } @@ -463,13 +466,13 @@ TEST_F(BackendCassandraTest, Basic) EXPECT_TRUE(key256.parseHex(accountIndexHex)); auto obj = backend->fetchLedgerObject(key256, lgrInfoNext.seq, yield); EXPECT_TRUE(obj); - EXPECT_STREQ((const char*)obj->data(), (const char*)accountBlob.data()); + EXPECT_STREQ(reinterpret_cast(obj->data()), static_cast(accountBlob.data())); obj = backend->fetchLedgerObject(key256, lgrInfoNext.seq + 1, yield); EXPECT_TRUE(obj); - EXPECT_STREQ((const char*)obj->data(), (const char*)accountBlob.data()); + EXPECT_STREQ(reinterpret_cast(obj->data()), static_cast(accountBlob.data())); obj = backend->fetchLedgerObject(key256, lgrInfoNext.seq - 1, yield); EXPECT_TRUE(obj); - EXPECT_STREQ((const char*)obj->data(), (const char*)accountBlobOld.data()); + EXPECT_STREQ(reinterpret_cast(obj->data()), static_cast(accountBlobOld.data())); obj = backend->fetchLedgerObject(key256, lgrInfoOld.seq - 1, yield); EXPECT_FALSE(obj); } @@ -505,7 +508,7 @@ TEST_F(BackendCassandraTest, Basic) EXPECT_FALSE(obj); obj = backend->fetchLedgerObject(key256, lgrInfoNext.seq - 2, yield); EXPECT_TRUE(obj); - EXPECT_STREQ((const char*)obj->data(), (const char*)accountBlobOld.data()); + EXPECT_STREQ(reinterpret_cast(obj->data()), static_cast(accountBlobOld.data())); obj = backend->fetchLedgerObject(key256, lgrInfoOld.seq - 1, yield); EXPECT_FALSE(obj); } @@ -518,7 +521,7 @@ TEST_F(BackendCassandraTest, Basic) for (auto& blob : res) { ++key; - std::string keyStr{(const char*)key.data(), key.size()}; + std::string keyStr{reinterpret_cast(key.data()), key.size()}; blob.first = keyStr; blob.second = std::to_string(ledgerSequence) + keyStr; } @@ -538,7 +541,7 @@ TEST_F(BackendCassandraTest, Basic) for (auto& blob : res) { ++base; - std::string hashStr{(const char*)base.data(), base.size()}; + std::string hashStr{reinterpret_cast(base.data()), base.size()}; std::string txnStr = "tx" + std::to_string(ledgerSequence) + hashStr; std::string metaStr = "meta" + std::to_string(ledgerSequence) + hashStr; blob = std::make_tuple(hashStr, txnStr, metaStr); @@ -642,8 +645,14 @@ TEST_F(BackendCassandraTest, Basic) bool found = false; for (auto [retTxn, retMeta, retSeq, retDate] : retTxns) { - if (std::strncmp((const char*)retTxn.data(), (const char*)txn.data(), txn.size()) == 0 && - std::strncmp((const char*)retMeta.data(), (const char*)meta.data(), meta.size()) == 0) + if (std::strncmp( + reinterpret_cast(retTxn.data()), + static_cast(txn.data()), + txn.size()) == 0 && + std::strncmp( + reinterpret_cast(retMeta.data()), + static_cast(meta.data()), + meta.size()) == 0) found = true; } ASSERT_TRUE(found); @@ -655,19 +664,20 @@ TEST_F(BackendCassandraTest, Basic) do { uint32_t limit = 10; - auto [txns, retCursor] = backend->fetchAccountTransactions(account, limit, false, cursor, yield); + auto [accountTransactions, retCursor] = + backend->fetchAccountTransactions(account, limit, false, cursor, yield); if (retCursor) - EXPECT_EQ(txns.size(), limit); - retData.insert(retData.end(), txns.begin(), txns.end()); + EXPECT_EQ(accountTransactions.size(), limit); + retData.insert(retData.end(), accountTransactions.begin(), accountTransactions.end()); cursor = retCursor; } while (cursor); EXPECT_EQ(retData.size(), data.size()); for (size_t i = 0; i < retData.size(); ++i) { - auto [txn, meta, seq, date] = retData[i]; - auto [hash, expTxn, expMeta] = data[i]; - EXPECT_STREQ((const char*)txn.data(), (const char*)expTxn.data()); - EXPECT_STREQ((const char*)meta.data(), (const char*)expMeta.data()); + auto [txn, meta, _, __] = retData[i]; + auto [___, expTxn, expMeta] = data[i]; + EXPECT_STREQ(reinterpret_cast(txn.data()), static_cast(expTxn.data())); + EXPECT_STREQ(reinterpret_cast(meta.data()), static_cast(expMeta.data())); } } std::vector keys; @@ -677,7 +687,7 @@ TEST_F(BackendCassandraTest, Basic) if (obj.size()) { ASSERT_TRUE(retObj.has_value()); - EXPECT_STREQ((const char*)obj.data(), (const char*)retObj->data()); + EXPECT_STREQ(static_cast(obj.data()), reinterpret_cast(retObj->data())); } else { @@ -697,7 +707,8 @@ TEST_F(BackendCassandraTest, Basic) if (obj.size()) { ASSERT_TRUE(retObj.size()); - EXPECT_STREQ((const char*)obj.data(), (const char*)retObj.data()); + EXPECT_STREQ( + static_cast(obj.data()), reinterpret_cast(retObj.data())); } else { @@ -747,7 +758,7 @@ TEST_F(BackendCassandraTest, Basic) for (auto account : rec.accounts) { allAccountTx[lgrInfoNext.seq][account].push_back( - std::string{(const char*)rec.txHash.data(), rec.txHash.size()}); + std::string{reinterpret_cast(rec.txHash.data()), rec.txHash.size()}); } } EXPECT_EQ(objs.size(), 25); @@ -780,7 +791,7 @@ TEST_F(BackendCassandraTest, Basic) for (auto account : rec.accounts) { allAccountTx[lgrInfoNext.seq][account].push_back( - std::string{(const char*)rec.txHash.data(), rec.txHash.size()}); + std::string{reinterpret_cast(rec.txHash.data()), rec.txHash.size()}); } } EXPECT_EQ(objs.size(), 25); @@ -916,10 +927,10 @@ TEST_F(BackendCassandraTest, CacheIntegration) lgrInfoNext.hash++; lgrInfoNext.accountHash = ~lgrInfo.accountHash; { - std::string rawHeaderBlob = ledgerInfoToBinaryString(lgrInfoNext); + std::string infoBlob = ledgerInfoToBinaryString(lgrInfoNext); backend->startWrites(); - backend->writeLedger(lgrInfoNext, std::move(rawHeaderBlob)); + backend->writeLedger(lgrInfoNext, std::move(infoBlob)); ASSERT_TRUE(backend->finishWrites(lgrInfoNext.seq)); } { @@ -979,10 +990,10 @@ TEST_F(BackendCassandraTest, CacheIntegration) EXPECT_TRUE(key256.parseHex(accountIndexHex)); auto obj = backend->fetchLedgerObject(key256, lgrInfoNext.seq, yield); EXPECT_TRUE(obj); - EXPECT_STREQ((const char*)obj->data(), (const char*)accountBlob.data()); + EXPECT_STREQ(reinterpret_cast(obj->data()), static_cast(accountBlob.data())); obj = backend->fetchLedgerObject(key256, lgrInfoNext.seq + 1, yield); EXPECT_TRUE(obj); - EXPECT_STREQ((const char*)obj->data(), (const char*)accountBlob.data()); + EXPECT_STREQ(reinterpret_cast(obj->data()), static_cast(accountBlob.data())); obj = backend->fetchLedgerObject(key256, lgrInfoOld.seq - 1, yield); EXPECT_FALSE(obj); } @@ -1017,13 +1028,13 @@ TEST_F(BackendCassandraTest, CacheIntegration) EXPECT_TRUE(key256.parseHex(accountIndexHex)); auto obj = backend->fetchLedgerObject(key256, lgrInfoNext.seq, yield); EXPECT_TRUE(obj); - EXPECT_STREQ((const char*)obj->data(), (const char*)accountBlob.data()); + EXPECT_STREQ(reinterpret_cast(obj->data()), static_cast(accountBlob.data())); obj = backend->fetchLedgerObject(key256, lgrInfoNext.seq + 1, yield); EXPECT_TRUE(obj); - EXPECT_STREQ((const char*)obj->data(), (const char*)accountBlob.data()); + EXPECT_STREQ(reinterpret_cast(obj->data()), static_cast(accountBlob.data())); obj = backend->fetchLedgerObject(key256, lgrInfoNext.seq - 1, yield); EXPECT_TRUE(obj); - EXPECT_STREQ((const char*)obj->data(), (const char*)accountBlobOld.data()); + EXPECT_STREQ(reinterpret_cast(obj->data()), static_cast(accountBlobOld.data())); obj = backend->fetchLedgerObject(key256, lgrInfoOld.seq - 1, yield); EXPECT_FALSE(obj); } @@ -1059,7 +1070,7 @@ TEST_F(BackendCassandraTest, CacheIntegration) EXPECT_FALSE(obj); obj = backend->fetchLedgerObject(key256, lgrInfoNext.seq - 2, yield); EXPECT_TRUE(obj); - EXPECT_STREQ((const char*)obj->data(), (const char*)accountBlobOld.data()); + EXPECT_STREQ(reinterpret_cast(obj->data()), static_cast(accountBlobOld.data())); obj = backend->fetchLedgerObject(key256, lgrInfoOld.seq - 1, yield); EXPECT_FALSE(obj); } @@ -1072,7 +1083,7 @@ TEST_F(BackendCassandraTest, CacheIntegration) for (auto& blob : res) { ++key; - std::string keyStr{(const char*)key.data(), key.size()}; + std::string keyStr{reinterpret_cast(key.data()), key.size()}; blob.first = keyStr; blob.second = std::to_string(ledgerSequence) + keyStr; } @@ -1154,7 +1165,7 @@ TEST_F(BackendCassandraTest, CacheIntegration) if (obj.size()) { ASSERT_TRUE(retObj.has_value()); - EXPECT_STREQ((const char*)obj.data(), (const char*)retObj->data()); + EXPECT_STREQ(static_cast(obj.data()), reinterpret_cast(retObj->data())); } else { @@ -1174,7 +1185,8 @@ TEST_F(BackendCassandraTest, CacheIntegration) if (obj.size()) { ASSERT_TRUE(retObj.size()); - EXPECT_STREQ((const char*)obj.data(), (const char*)retObj.data()); + EXPECT_STREQ( + static_cast(obj.data()), reinterpret_cast(retObj.data())); } else { diff --git a/unittests/data/cassandra/BaseTests.cpp b/unittests/data/cassandra/BaseTests.cpp index 1e303485..349c644d 100644 --- a/unittests/data/cassandra/BaseTests.cpp +++ b/unittests/data/cassandra/BaseTests.cpp @@ -30,8 +30,6 @@ using namespace std; using namespace data::cassandra; -namespace json = boost::json; - class BackendCassandraBaseTest : public NoLoggerFixture { protected: @@ -88,7 +86,7 @@ protected: int64_t idx = 1000; for (auto const& entry : entries) - statements.push_back(insert.bind(entry, static_cast(idx++))); + statements.push_back(insert.bind(entry, idx++)); EXPECT_EQ(statements.size(), entries.size()); EXPECT_TRUE(handle.execute(statements)); @@ -241,9 +239,11 @@ TEST_F(BackendCassandraBaseTest, CreateTableWithStrings) )", 5000); - auto const f1 = handle.asyncExecute(q1); - auto const rc = f1.await(); - ASSERT_TRUE(rc) << rc.error(); + { + auto const f1 = handle.asyncExecute(q1); + auto const rc = f1.await(); + ASSERT_TRUE(rc) << rc.error(); + } std::string q2 = "INSERT INTO strings (hash, sequence) VALUES (?, ?)"; auto insert = handle.prepare(q2); @@ -254,7 +254,7 @@ TEST_F(BackendCassandraBaseTest, CreateTableWithStrings) int64_t idx = 1000; for (auto const& entry : entries) - futures.push_back(handle.asyncExecute(insert, entry, static_cast(idx++))); + futures.push_back(handle.asyncExecute(insert, entry, idx++)); ASSERT_EQ(futures.size(), entries.size()); for (auto const& f : futures) @@ -302,9 +302,11 @@ TEST_F(BackendCassandraBaseTest, BatchInsert) WITH default_time_to_live = {} )", 5000); - auto const f1 = handle.asyncExecute(q1); - auto const rc = f1.await(); - ASSERT_TRUE(rc) << rc.error(); + { + auto const f1 = handle.asyncExecute(q1); + auto const rc = f1.await(); + ASSERT_TRUE(rc) << rc.error(); + } std::string q2 = "INSERT INTO strings (hash, sequence) VALUES (?, ?)"; auto const insert = handle.prepare(q2); @@ -315,7 +317,7 @@ TEST_F(BackendCassandraBaseTest, BatchInsert) int64_t idx = 1000; for (auto const& entry : entries) - statements.push_back(insert.bind(entry, static_cast(idx++))); + statements.push_back(insert.bind(entry, idx++)); ASSERT_EQ(statements.size(), entries.size()); @@ -374,7 +376,7 @@ TEST_F(BackendCassandraBaseTest, BatchInsertAsync) int64_t idx = 1000; for (auto const& entry : entries) - statements.push_back(insert.bind(entry, static_cast(idx++))); + statements.push_back(insert.bind(entry, idx++)); ASSERT_EQ(statements.size(), entries.size()); fut.emplace(handle.asyncExecute(statements, [&](auto const res) { @@ -434,8 +436,7 @@ TEST_F(BackendCassandraBaseTest, AlterTableMoveToNewTable) { static_assert(std::is_same_v); static_assert(std::is_same_v); - migrationStatements.push_back( - migrationInsert.bind(hash, static_cast(seq), static_cast(seq + 1u))); + migrationStatements.push_back(migrationInsert.bind(hash, seq, seq + 1u)); } EXPECT_TRUE(handle.execute(migrationStatements)); diff --git a/unittests/data/cassandra/ExecutionStrategyTests.cpp b/unittests/data/cassandra/ExecutionStrategyTests.cpp index bde18a82..907f5e52 100644 --- a/unittests/data/cassandra/ExecutionStrategyTests.cpp +++ b/unittests/data/cassandra/ExecutionStrategyTests.cpp @@ -38,7 +38,7 @@ TEST_F(BackendCassandraExecutionStrategyTest, ReadOneInCoroutineSuccessful) auto strat = DefaultExecutionStrategy{Settings{}, handle}; ON_CALL(handle, asyncExecute(An(), An&&>())) - .WillByDefault([](auto const& statement, auto&& cb) { + .WillByDefault([](auto const& /* statement */, auto&& cb) { cb({}); // pretend we got data return FakeFutureWithCallback{}; }); diff --git a/unittests/data/cassandra/impl/FakesAndMocks.h b/unittests/data/cassandra/impl/FakesAndMocks.h index 75b6f286..2f7eb870 100644 --- a/unittests/data/cassandra/impl/FakesAndMocks.h +++ b/unittests/data/cassandra/impl/FakesAndMocks.h @@ -115,8 +115,7 @@ struct FakeRetryPolicy { FakeRetryPolicy(boost::asio::io_context&){}; // required by concept - std::chrono::milliseconds - calculateDelay(uint32_t attempt) + std::chrono::milliseconds calculateDelay(uint32_t /* attempt */) { return std::chrono::milliseconds{1}; } diff --git a/unittests/etl/ExtractorTests.cpp b/unittests/etl/ExtractorTests.cpp index b2cf4d64..0b94d2ec 100644 --- a/unittests/etl/ExtractorTests.cpp +++ b/unittests/etl/ExtractorTests.cpp @@ -68,8 +68,7 @@ public: TEST_F(ETLExtractorTest, StopsWhenCurrentSequenceExceedsFinishSequence) { - auto const rawNetworkValidatedLedgersPtr = - static_cast(networkValidatedLedgers_.get()); + auto const rawNetworkValidatedLedgersPtr = networkValidatedLedgers_.get(); ON_CALL(*rawNetworkValidatedLedgersPtr, waitUntilValidatedByNetwork).WillByDefault(Return(true)); EXPECT_CALL(*rawNetworkValidatedLedgersPtr, waitUntilValidatedByNetwork).Times(3); @@ -107,8 +106,7 @@ TEST_F(ETLExtractorTest, StopsOnServerShutdown) // stop extractor thread if fetcheResponse is empty TEST_F(ETLExtractorTest, StopsIfFetchIsUnsuccessful) { - auto const rawNetworkValidatedLedgersPtr = - static_cast(networkValidatedLedgers_.get()); + auto const rawNetworkValidatedLedgersPtr = networkValidatedLedgers_.get(); ON_CALL(*rawNetworkValidatedLedgersPtr, waitUntilValidatedByNetwork).WillByDefault(Return(true)); EXPECT_CALL(*rawNetworkValidatedLedgersPtr, waitUntilValidatedByNetwork).Times(1); @@ -123,8 +121,7 @@ TEST_F(ETLExtractorTest, StopsIfFetchIsUnsuccessful) TEST_F(ETLExtractorTest, StopsIfWaitingUntilValidatedByNetworkTimesOut) { - auto const rawNetworkValidatedLedgersPtr = - static_cast(networkValidatedLedgers_.get()); + auto const rawNetworkValidatedLedgersPtr = networkValidatedLedgers_.get(); // note that in actual clio code we don't return false unless a timeout is specified and exceeded ON_CALL(*rawNetworkValidatedLedgersPtr, waitUntilValidatedByNetwork).WillByDefault(Return(false)); @@ -137,8 +134,7 @@ TEST_F(ETLExtractorTest, StopsIfWaitingUntilValidatedByNetworkTimesOut) TEST_F(ETLExtractorTest, SendsCorrectResponseToDataPipe) { - auto const rawNetworkValidatedLedgersPtr = - static_cast(networkValidatedLedgers_.get()); + auto const rawNetworkValidatedLedgersPtr = networkValidatedLedgers_.get(); ON_CALL(*rawNetworkValidatedLedgersPtr, waitUntilValidatedByNetwork).WillByDefault(Return(true)); EXPECT_CALL(*rawNetworkValidatedLedgersPtr, waitUntilValidatedByNetwork).Times(1); diff --git a/unittests/rpc/BaseTests.cpp b/unittests/rpc/BaseTests.cpp index 0c49e5f6..f71b4d3c 100644 --- a/unittests/rpc/BaseTests.cpp +++ b/unittests/rpc/BaseTests.cpp @@ -346,7 +346,7 @@ TEST_F(RPCBaseTest, CustomValidator) { // clang-format off auto customFormatCheck = CustomValidator{ - [](json::value const& value, std::string_view key) -> MaybeError { + [](json::value const& value, std::string_view /* key */) -> MaybeError { return value.as_string().size() == 34 ? MaybeError{} : Error{rpc::Status{"Uh oh"}}; } diff --git a/unittests/rpc/ForwardingProxyTests.cpp b/unittests/rpc/ForwardingProxyTests.cpp index 1f1c5522..effb8e8d 100644 --- a/unittests/rpc/ForwardingProxyTests.cpp +++ b/unittests/rpc/ForwardingProxyTests.cpp @@ -52,7 +52,7 @@ protected: TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsFalseIfClioOnly) { - auto const rawHandlerProviderPtr = static_cast(handlerProvider.get()); + auto const rawHandlerProviderPtr = handlerProvider.get(); auto const apiVersion = 2u; auto const method = "test"; auto const params = json::parse("{}"); @@ -72,7 +72,7 @@ TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsFalseIfClioOnly) TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsTrueIfProxied) { - auto const rawHandlerProviderPtr = static_cast(handlerProvider.get()); + auto const rawHandlerProviderPtr = handlerProvider.get(); auto const apiVersion = 2u; auto const method = "submit"; auto const params = json::parse("{}"); @@ -92,7 +92,7 @@ TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsTrueIfProxied) TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsTrueIfCurrentLedgerSpecified) { - auto const rawHandlerProviderPtr = static_cast(handlerProvider.get()); + auto const rawHandlerProviderPtr = handlerProvider.get(); auto const apiVersion = 2u; auto const method = "anymethod"; auto const params = json::parse(R"({"ledger_index": "current"})"); @@ -112,7 +112,7 @@ TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsTrueIfCurrentLedgerSpecified) TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsTrueIfClosedLedgerSpecified) { - auto const rawHandlerProviderPtr = static_cast(handlerProvider.get()); + auto const rawHandlerProviderPtr = handlerProvider.get(); auto const apiVersion = 2u; auto const method = "anymethod"; auto const params = json::parse(R"({"ledger_index": "closed"})"); @@ -132,7 +132,7 @@ TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsTrueIfClosedLedgerSpecified) TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsTrueIfAccountInfoWithQueueSpecified) { - auto const rawHandlerProviderPtr = static_cast(handlerProvider.get()); + auto const rawHandlerProviderPtr = handlerProvider.get(); auto const apiVersion = 2u; auto const method = "account_info"; auto const params = json::parse(R"({"queue": true})"); @@ -152,7 +152,7 @@ TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsTrueIfAccountInfoWithQueueSpe TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsTrueIfLedgerWithQueueSpecified) { - auto const rawHandlerProviderPtr = static_cast(handlerProvider.get()); + auto const rawHandlerProviderPtr = handlerProvider.get(); auto const apiVersion = 2u; auto const method = "ledger"; auto const params = json::parse(R"({"queue": true})"); @@ -172,7 +172,7 @@ TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsTrueIfLedgerWithQueueSpecifie TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsTrueIfLedgerWithFullSpecified) { - auto const rawHandlerProviderPtr = static_cast(handlerProvider.get()); + auto const rawHandlerProviderPtr = handlerProvider.get(); auto const apiVersion = 2u; auto const method = "ledger"; auto const params = json::parse(R"({"full": true})"); @@ -192,7 +192,7 @@ TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsTrueIfLedgerWithFullSpecified TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsTrueIfLedgerWithAccountsSpecified) { - auto const rawHandlerProviderPtr = static_cast(handlerProvider.get()); + auto const rawHandlerProviderPtr = handlerProvider.get(); auto const apiVersion = 2u; auto const method = "ledger"; auto const params = json::parse(R"({"accounts": true})"); @@ -212,7 +212,7 @@ TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsTrueIfLedgerWithAccountsSpeci TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsFalseIfAccountInfoQueueIsFalse) { - auto const rawHandlerProviderPtr = static_cast(handlerProvider.get()); + auto const rawHandlerProviderPtr = handlerProvider.get(); auto const apiVersion = 2u; auto const method = "account_info"; auto const params = json::parse(R"({"queue": false})"); @@ -232,7 +232,7 @@ TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsFalseIfAccountInfoQueueIsFals TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsFalseIfLedgerQueueIsFalse) { - auto const rawHandlerProviderPtr = static_cast(handlerProvider.get()); + auto const rawHandlerProviderPtr = handlerProvider.get(); auto const apiVersion = 2u; auto const method = "ledger"; auto const params = json::parse(R"({"queue": false})"); @@ -252,7 +252,7 @@ TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsFalseIfLedgerQueueIsFalse) TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsFalseIfLedgerFullIsFalse) { - auto const rawHandlerProviderPtr = static_cast(handlerProvider.get()); + auto const rawHandlerProviderPtr = handlerProvider.get(); auto const apiVersion = 2u; auto const method = "ledger"; auto const params = json::parse(R"({"full": false})"); @@ -272,7 +272,7 @@ TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsFalseIfLedgerFullIsFalse) TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsFalseIfLedgerAccountsIsFalse) { - auto const rawHandlerProviderPtr = static_cast(handlerProvider.get()); + auto const rawHandlerProviderPtr = handlerProvider.get(); auto const apiVersion = 2u; auto const method = "ledger"; auto const params = json::parse(R"({"accounts": false})"); @@ -296,7 +296,7 @@ TEST_F(RPCForwardingProxyTest, ShouldNotForwardReturnsTrueIfAPIVersionIsV1) auto const method = "api_version_check"; auto const params = json::parse("{}"); - auto const rawHandlerProviderPtr = static_cast(handlerProvider.get()); + auto const rawHandlerProviderPtr = handlerProvider.get(); ON_CALL(*rawHandlerProviderPtr, isClioOnly(_)).WillByDefault(Return(false)); EXPECT_CALL(*rawHandlerProviderPtr, isClioOnly(method)).Times(1); @@ -312,7 +312,7 @@ TEST_F(RPCForwardingProxyTest, ShouldNotForwardReturnsTrueIfAPIVersionIsV1) TEST_F(RPCForwardingProxyTest, ShouldForwardReturnsFalseIfAPIVersionIsV2) { - auto const rawHandlerProviderPtr = static_cast(handlerProvider.get()); + auto const rawHandlerProviderPtr = handlerProvider.get(); auto const apiVersion = 2u; auto const method = "api_version_check"; auto const params = json::parse("{}"); @@ -364,8 +364,8 @@ TEST_F(RPCForwardingProxyTest, ShouldNeverForwardUnsubscribe) TEST_F(RPCForwardingProxyTest, ForwardCallsBalancerWithCorrectParams) { - auto const rawHandlerProviderPtr = static_cast(handlerProvider.get()); - auto const rawBalancerPtr = static_cast(loadBalancer.get()); + auto const rawHandlerProviderPtr = handlerProvider.get(); + auto const rawBalancerPtr = loadBalancer.get(); auto const apiVersion = 2u; auto const method = "submit"; auto const params = json::parse(R"({"test": true})"); @@ -394,8 +394,8 @@ TEST_F(RPCForwardingProxyTest, ForwardCallsBalancerWithCorrectParams) TEST_F(RPCForwardingProxyTest, ForwardingFailYieldsErrorStatus) { - auto const rawHandlerProviderPtr = static_cast(handlerProvider.get()); - auto const rawBalancerPtr = static_cast(loadBalancer.get()); + auto const rawHandlerProviderPtr = handlerProvider.get(); + auto const rawBalancerPtr = loadBalancer.get(); auto const apiVersion = 2u; auto const method = "submit"; auto const params = json::parse(R"({"test": true})"); diff --git a/unittests/rpc/WorkQueueTests.cpp b/unittests/rpc/WorkQueueTests.cpp index 1e3f8fa6..9feaa74c 100644 --- a/unittests/rpc/WorkQueueTests.cpp +++ b/unittests/rpc/WorkQueueTests.cpp @@ -55,7 +55,7 @@ TEST_F(RPCWorkQueueTest, WhitelistedExecutionCountAddsUp) for (auto i = 0u; i < TOTAL; ++i) { queue.postCoro( - [&executeCount, &sem, &mtx](auto yield) { + [&executeCount, &sem, &mtx](auto /* yield */) { std::lock_guard lk(mtx); if (++executeCount; executeCount == TOTAL) sem.release(); // 1) note we are still in user function @@ -91,7 +91,7 @@ TEST_F(RPCWorkQueueTest, NonWhitelistedPreventSchedulingAtQueueLimitExceeded) for (auto i = 0u; i < TOTAL; ++i) { auto res = queue.postCoro( - [&](auto yield) { + [&](auto /* yield */) { std::unique_lock lk{mtx}; cv.wait(lk, [&] { return unblocked == true; }); diff --git a/unittests/rpc/handlers/AccountCurrenciesTests.cpp b/unittests/rpc/handlers/AccountCurrenciesTests.cpp index c4d93c34..464f6ef1 100644 --- a/unittests/rpc/handlers/AccountCurrenciesTests.cpp +++ b/unittests/rpc/handlers/AccountCurrenciesTests.cpp @@ -180,16 +180,13 @@ TEST_F(RPCAccountCurrenciesHandlerTest, DefaultParameter) // ACCOUNT can receive USD 10 from ACCOUNT2 and send USD 20 to ACCOUNT2, now // the balance is 100, ACCOUNT can only send USD to ACCOUNT2 - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); // ACCOUNT2 can receive JPY 10 from ACCOUNT and send JPY 20 to ACCOUNT, now // the balance is 100, ACCOUNT2 can only send JPY to ACCOUNT - auto const line2 = - CreateRippleStateLedgerObject(ACCOUNT, "JPY", ISSUER, 100, ACCOUNT2, 10, ACCOUNT, 20, TXNID, 123, 0); + auto const line2 = CreateRippleStateLedgerObject("JPY", ISSUER, 100, ACCOUNT2, 10, ACCOUNT, 20, TXNID, 123, 0); // ACCOUNT can receive EUR 10 from ACCOUNT and send EUR 20 to ACCOUNT2, now // the balance is 8, ACCOUNT can receive/send EUR to/from ACCOUNT2 - auto const line3 = - CreateRippleStateLedgerObject(ACCOUNT, "EUR", ISSUER, 8, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line3 = CreateRippleStateLedgerObject("EUR", ISSUER, 8, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); std::vector bbs; bbs.push_back(line1.getSerializer().peekData()); bbs.push_back(line2.getSerializer().peekData()); @@ -229,8 +226,7 @@ TEST_F(RPCAccountCurrenciesHandlerTest, RequestViaLegderHash) .WillByDefault(Return(ownerDir.getSerializer().peekData())); EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(2); std::vector bbs; - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); bbs.push_back(line1.getSerializer().peekData()); ON_CALL(*rawBackendPtr, doFetchLedgerObjects).WillByDefault(Return(bbs)); @@ -270,8 +266,7 @@ TEST_F(RPCAccountCurrenciesHandlerTest, RequestViaLegderSeq) .WillByDefault(Return(ownerDir.getSerializer().peekData())); EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(2); std::vector bbs; - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); bbs.push_back(line1.getSerializer().peekData()); ON_CALL(*rawBackendPtr, doFetchLedgerObjects).WillByDefault(Return(bbs)); diff --git a/unittests/rpc/handlers/AccountLinesTests.cpp b/unittests/rpc/handlers/AccountLinesTests.cpp index f27a3c9d..c6d93759 100644 --- a/unittests/rpc/handlers/AccountLinesTests.cpp +++ b/unittests/rpc/handlers/AccountLinesTests.cpp @@ -465,10 +465,8 @@ TEST_F(RPCAccountLinesHandlerTest, DefaultParameterTest) // return two trust lines std::vector bbs; - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); - auto const line2 = - CreateRippleStateLedgerObject(ACCOUNT2, "USD", ACCOUNT, 10, ACCOUNT2, 100, ACCOUNT, 200, TXNID, 123); + auto const line1 = CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); + auto const line2 = CreateRippleStateLedgerObject("USD", ACCOUNT, 10, ACCOUNT2, 100, ACCOUNT, 200, TXNID, 123); bbs.push_back(line1.getSerializer().peekData()); bbs.push_back(line2.getSerializer().peekData()); ON_CALL(*rawBackendPtr, doFetchLedgerObjects).WillByDefault(Return(bbs)); @@ -545,8 +543,7 @@ TEST_F(RPCAccountLinesHandlerTest, UseLimit) while (repetitions--) { indexes.push_back(ripple::uint256{INDEX1}); - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); + auto const line = CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); bbs.push_back(line.getSerializer().peekData()); } ripple::STObject ownerDir = CreateOwnerDirLedgerObject(indexes, INDEX1); @@ -625,8 +622,7 @@ TEST_F(RPCAccountLinesHandlerTest, UseDestination) while (repetitions--) { indexes.push_back(ripple::uint256{INDEX1}); - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); + auto const line = CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); bbs.push_back(line.getSerializer().peekData()); } @@ -635,8 +631,7 @@ TEST_F(RPCAccountLinesHandlerTest, UseDestination) while (repetitions--) { indexes.push_back(ripple::uint256{INDEX1}); - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT3, 10, ACCOUNT, 100, ACCOUNT3, 200, TXNID, 123); + auto const line = CreateRippleStateLedgerObject("USD", ACCOUNT3, 10, ACCOUNT, 100, ACCOUNT3, 200, TXNID, 123); bbs.push_back(line.getSerializer().peekData()); } @@ -761,13 +756,13 @@ TEST_F(RPCAccountLinesHandlerTest, OptionalResponseField) // return few trust lines std::vector bbs; - auto line1 = CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 0); + auto line1 = CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 0); line1.setFlag(ripple::lsfHighAuth); line1.setFlag(ripple::lsfHighNoRipple); line1.setFlag(ripple::lsfHighFreeze); bbs.push_back(line1.getSerializer().peekData()); - auto line2 = CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 20, ACCOUNT, 200, ACCOUNT2, 400, TXNID, 0); + auto line2 = CreateRippleStateLedgerObject("USD", ACCOUNT2, 20, ACCOUNT, 200, ACCOUNT2, 400, TXNID, 0); line2.setFlag(ripple::lsfLowAuth); line2.setFlag(ripple::lsfLowNoRipple); line2.setFlag(ripple::lsfLowFreeze); @@ -809,7 +804,7 @@ TEST_F(RPCAccountLinesHandlerTest, MarkerOutput) EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(3); std::vector bbs; - auto line = CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 0); + auto line = CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 0); // owner dir contains 10 indexes int objectsCount = 10; @@ -878,8 +873,7 @@ TEST_F(RPCAccountLinesHandlerTest, MarkerInput) EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(3); std::vector bbs; - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 0); + auto const line = CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 0); int objectsCount = limit; std::vector indexes; while (objectsCount != 0) @@ -944,10 +938,8 @@ TEST_F(RPCAccountLinesHandlerTest, LimitLessThanMin) // return two trust lines std::vector bbs; - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); - auto const line2 = - CreateRippleStateLedgerObject(ACCOUNT2, "USD", ACCOUNT, 10, ACCOUNT2, 100, ACCOUNT, 200, TXNID, 123); + auto const line1 = CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); + auto const line2 = CreateRippleStateLedgerObject("USD", ACCOUNT, 10, ACCOUNT2, 100, ACCOUNT, 200, TXNID, 123); bbs.push_back(line1.getSerializer().peekData()); bbs.push_back(line2.getSerializer().peekData()); ON_CALL(*rawBackendPtr, doFetchLedgerObjects).WillByDefault(Return(bbs)); @@ -1027,10 +1019,8 @@ TEST_F(RPCAccountLinesHandlerTest, LimitMoreThanMax) // return two trust lines std::vector bbs; - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); - auto const line2 = - CreateRippleStateLedgerObject(ACCOUNT2, "USD", ACCOUNT, 10, ACCOUNT2, 100, ACCOUNT, 200, TXNID, 123); + auto const line1 = CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); + auto const line2 = CreateRippleStateLedgerObject("USD", ACCOUNT, 10, ACCOUNT2, 100, ACCOUNT, 200, TXNID, 123); bbs.push_back(line1.getSerializer().peekData()); bbs.push_back(line2.getSerializer().peekData()); ON_CALL(*rawBackendPtr, doFetchLedgerObjects).WillByDefault(Return(bbs)); diff --git a/unittests/rpc/handlers/AccountObjectsTests.cpp b/unittests/rpc/handlers/AccountObjectsTests.cpp index c36831d4..91660cf2 100644 --- a/unittests/rpc/handlers/AccountObjectsTests.cpp +++ b/unittests/rpc/handlers/AccountObjectsTests.cpp @@ -327,8 +327,7 @@ TEST_F(RPCAccountObjectsHandlerTest, DefaultParameterNoNFTFound) EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(3); std::vector bbs; - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); bbs.push_back(line1.getSerializer().peekData()); ON_CALL(*rawBackendPtr, doFetchLedgerObjects).WillByDefault(Return(bbs)); @@ -378,8 +377,7 @@ TEST_F(RPCAccountObjectsHandlerTest, Limit) std::vector bbs; while (count-- != 0) { - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); bbs.push_back(line1.getSerializer().peekData()); } ON_CALL(*rawBackendPtr, doFetchLedgerObjects).WillByDefault(Return(bbs)); @@ -427,8 +425,7 @@ TEST_F(RPCAccountObjectsHandlerTest, Marker) std::vector bbs; while (count-- != 0) { - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); bbs.push_back(line1.getSerializer().peekData()); } ON_CALL(*rawBackendPtr, doFetchLedgerObjects).WillByDefault(Return(bbs)); @@ -489,8 +486,7 @@ TEST_F(RPCAccountObjectsHandlerTest, MultipleDirNoNFT) cc = count * 2; while (cc-- != 0) { - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); bbs.push_back(line1.getSerializer().peekData()); } ON_CALL(*rawBackendPtr, doFetchLedgerObjects).WillByDefault(Return(bbs)); @@ -538,8 +534,7 @@ TEST_F(RPCAccountObjectsHandlerTest, TypeFilter) std::vector bbs; // put 1 state and 1 offer - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); auto const offer = CreateOfferLedgerObject( ACCOUNT, 10, @@ -594,8 +589,7 @@ TEST_F(RPCAccountObjectsHandlerTest, TypeFilterReturnEmpty) ON_CALL(*rawBackendPtr, doFetchLedgerObject(nftMaxKK, 30, _)).WillByDefault(Return(std::nullopt)); std::vector bbs; - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); auto const offer = CreateOfferLedgerObject( ACCOUNT, 10, @@ -653,8 +647,7 @@ TEST_F(RPCAccountObjectsHandlerTest, DeletionBlockersOnlyFilter) EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(3); - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); auto const channel = CreatePaymentChannelLedgerObject(ACCOUNT, ACCOUNT2, 100, 10, 32, TXNID, 28); auto const offer = CreateOfferLedgerObject( ACCOUNT, @@ -714,8 +707,7 @@ TEST_F(RPCAccountObjectsHandlerTest, DeletionBlockersOnlyFilterWithTypeFilter) auto const nftMaxKK = ripple::keylet::nftpage_max(account).key; ON_CALL(*rawBackendPtr, doFetchLedgerObject(nftMaxKK, 30, _)).WillByDefault(Return(std::nullopt)); - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); auto const channel = CreatePaymentChannelLedgerObject(ACCOUNT, ACCOUNT2, 100, 10, 32, TXNID, 28); std::vector bbs; @@ -971,8 +963,7 @@ TEST_F(RPCAccountObjectsHandlerTest, NFTMixOtherObjects) EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(4); std::vector bbs; - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); bbs.push_back(line1.getSerializer().peekData()); ON_CALL(*rawBackendPtr, doFetchLedgerObjects).WillByDefault(Return(bbs)); @@ -1134,8 +1125,7 @@ TEST_F(RPCAccountObjectsHandlerTest, NFTMarker) ON_CALL(*rawBackendPtr, doFetchLedgerObject(ownerDirKk, 30, _)) .WillByDefault(Return(ownerDir.getSerializer().peekData())); - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); auto const channel = CreatePaymentChannelLedgerObject(ACCOUNT, ACCOUNT2, 100, 10, 32, TXNID, 28); auto const offer = CreateOfferLedgerObject( ACCOUNT, @@ -1195,8 +1185,7 @@ TEST_F(RPCAccountObjectsHandlerTest, NFTMarkerNoMoreNFT) ON_CALL(*rawBackendPtr, doFetchLedgerObject(ownerDirKk, 30, _)) .WillByDefault(Return(ownerDir.getSerializer().peekData())); - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); auto const channel = CreatePaymentChannelLedgerObject(ACCOUNT, ACCOUNT2, 100, 10, 32, TXNID, 28); auto const offer = CreateOfferLedgerObject( ACCOUNT, @@ -1344,8 +1333,7 @@ TEST_F(RPCAccountObjectsHandlerTest, NFTLimitAdjust) ON_CALL(*rawBackendPtr, doFetchLedgerObject(ownerDirKk, 30, _)) .WillByDefault(Return(ownerDir.getSerializer().peekData())); - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); auto const channel = CreatePaymentChannelLedgerObject(ACCOUNT, ACCOUNT2, 100, 10, 32, TXNID, 28); auto const offer = CreateOfferLedgerObject( ACCOUNT, @@ -1462,8 +1450,7 @@ TEST_F(RPCAccountObjectsHandlerTest, FilterNFT) EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(4); std::vector bbs; - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); bbs.push_back(line1.getSerializer().peekData()); ON_CALL(*rawBackendPtr, doFetchLedgerObjects).WillByDefault(Return(bbs)); @@ -1510,8 +1497,7 @@ TEST_F(RPCAccountObjectsHandlerTest, NFTZeroMarkerNotAffectOtherMarker) std::vector bbs; while (count-- != 0) { - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); bbs.push_back(line1.getSerializer().peekData()); } ON_CALL(*rawBackendPtr, doFetchLedgerObjects).WillByDefault(Return(bbs)); @@ -1595,8 +1581,7 @@ TEST_F(RPCAccountObjectsHandlerTest, LimitLessThanMin) EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(3); std::vector bbs; - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); bbs.push_back(line1.getSerializer().peekData()); ON_CALL(*rawBackendPtr, doFetchLedgerObjects).WillByDefault(Return(bbs)); @@ -1676,8 +1661,7 @@ TEST_F(RPCAccountObjectsHandlerTest, LimitMoreThanMax) EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(3); std::vector bbs; - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); bbs.push_back(line1.getSerializer().peekData()); ON_CALL(*rawBackendPtr, doFetchLedgerObjects).WillByDefault(Return(bbs)); diff --git a/unittests/rpc/handlers/BookOffersTests.cpp b/unittests/rpc/handlers/BookOffersTests.cpp index d368ebe1..d39b53bf 100644 --- a/unittests/rpc/handlers/BookOffersTests.cpp +++ b/unittests/rpc/handlers/BookOffersTests.cpp @@ -531,7 +531,7 @@ generateNormalPathBookOffersTestBundles() auto const account2 = GetAccountIDWithString(ACCOUNT2); auto const frozenTrustLine = CreateRippleStateLedgerObject( - ACCOUNT2, "USD", ACCOUNT, -8, ACCOUNT2, 1000, ACCOUNT, 2000, INDEX1, 2, ripple::lsfLowFreeze); + "USD", ACCOUNT, -8, ACCOUNT2, 1000, ACCOUNT, 2000, INDEX1, 2, ripple::lsfLowFreeze); auto const gets10USDPays20XRPOffer = CreateOfferLedgerObject( ACCOUNT2, @@ -599,10 +599,10 @@ generateNormalPathBookOffersTestBundles() auto const feeLedgerObject = CreateFeeSettingBlob(1, 2, 3, 4, 0); auto const trustline30Balance = - CreateRippleStateLedgerObject(ACCOUNT2, "USD", ACCOUNT, -30, ACCOUNT2, 1000, ACCOUNT, 2000, INDEX1, 2, 0); + CreateRippleStateLedgerObject("USD", ACCOUNT, -30, ACCOUNT2, 1000, ACCOUNT, 2000, INDEX1, 2, 0); auto const trustline8Balance = - CreateRippleStateLedgerObject(ACCOUNT2, "USD", ACCOUNT, -8, ACCOUNT2, 1000, ACCOUNT, 2000, INDEX1, 2, 0); + CreateRippleStateLedgerObject("USD", ACCOUNT, -8, ACCOUNT2, 1000, ACCOUNT, 2000, INDEX1, 2, 0); return std::vector{ BookOffersNormalTestBundle{ diff --git a/unittests/rpc/handlers/GatewayBalancesTests.cpp b/unittests/rpc/handlers/GatewayBalancesTests.cpp index 844b2e74..5c3a79a8 100644 --- a/unittests/rpc/handlers/GatewayBalancesTests.cpp +++ b/unittests/rpc/handlers/GatewayBalancesTests.cpp @@ -318,7 +318,7 @@ TEST_F(RPCGatewayBalancesHandlerTest, InvalidHotWallet) EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(2); // create a valid line, balance is 0 - auto const line1 = CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 0, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 0, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123); std::vector bbs; bbs.push_back(line1.getSerializer().peekData()); ON_CALL(*rawBackendPtr, doFetchLedgerObjects).WillByDefault(Return(bbs)); @@ -415,12 +415,10 @@ TEST_P(NormalPathTest, CheckOutput) auto generateNormalPathTestBundles() { - auto frozenState = - CreateRippleStateLedgerObject(ACCOUNT, "JPY", ISSUER, -50, ACCOUNT, 10, ACCOUNT3, 20, TXNID, 123); + auto frozenState = CreateRippleStateLedgerObject("JPY", ISSUER, -50, ACCOUNT, 10, ACCOUNT3, 20, TXNID, 123); frozenState.setFieldU32(ripple::sfFlags, ripple::lsfLowFreeze); - auto overflowState = - CreateRippleStateLedgerObject(ACCOUNT, "JPY", ISSUER, 50, ACCOUNT, 10, ACCOUNT3, 20, TXNID, 123); + auto overflowState = CreateRippleStateLedgerObject("JPY", ISSUER, 50, ACCOUNT, 10, ACCOUNT3, 20, TXNID, 123); int64_t min64 = -9922966390934554; overflowState.setFieldAmount(ripple::sfBalance, ripple::STAmount(GetIssue("JPY", ISSUER), min64, 80)); return std::vector{ @@ -434,18 +432,17 @@ generateNormalPathTestBundles() ripple::uint256{INDEX2}, ripple::uint256{INDEX2}}, INDEX1), - std::vector{ - // hotwallet - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, -10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123), - // hotwallet - CreateRippleStateLedgerObject(ACCOUNT, "CNY", ISSUER, -20, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123), - // positive balance -> asset - CreateRippleStateLedgerObject(ACCOUNT, "EUR", ISSUER, 30, ACCOUNT, 100, ACCOUNT3, 200, TXNID, 123), - // positive balance -> asset - CreateRippleStateLedgerObject(ACCOUNT, "JPY", ISSUER, 40, ACCOUNT, 100, ACCOUNT3, 200, TXNID, 123), - // obligation - CreateRippleStateLedgerObject(ACCOUNT, "JPY", ISSUER, -50, ACCOUNT, 10, ACCOUNT3, 20, TXNID, 123), - frozenState + std::vector{// hotwallet + CreateRippleStateLedgerObject("USD", ISSUER, -10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123), + // hotwallet + CreateRippleStateLedgerObject("CNY", ISSUER, -20, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123), + // positive balance -> asset + CreateRippleStateLedgerObject("EUR", ISSUER, 30, ACCOUNT, 100, ACCOUNT3, 200, TXNID, 123), + // positive balance -> asset + CreateRippleStateLedgerObject("JPY", ISSUER, 40, ACCOUNT, 100, ACCOUNT3, 200, TXNID, 123), + // obligation + CreateRippleStateLedgerObject("JPY", ISSUER, -50, ACCOUNT, 10, ACCOUNT3, 20, TXNID, 123), + frozenState }, fmt::format( @@ -497,8 +494,7 @@ generateNormalPathTestBundles() NormalTestBundle{ "NoHotwallet", CreateOwnerDirLedgerObject({ripple::uint256{INDEX2}}, INDEX1), - std::vector{ - CreateRippleStateLedgerObject(ACCOUNT, "JPY", ISSUER, -50, ACCOUNT, 10, ACCOUNT3, 20, TXNID, 123)}, + std::vector{CreateRippleStateLedgerObject("JPY", ISSUER, -50, ACCOUNT, 10, ACCOUNT3, 20, TXNID, 123)}, fmt::format( R"({{ "obligations":{{ @@ -530,13 +526,12 @@ generateNormalPathTestBundles() CreateOwnerDirLedgerObject( {ripple::uint256{INDEX2}, ripple::uint256{INDEX2}, ripple::uint256{INDEX2}, ripple::uint256{INDEX2}}, INDEX1), - std::vector{ - // hotwallet - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 10, ACCOUNT2, 100, ACCOUNT, 200, TXNID, 123), - // hotwallet - CreateRippleStateLedgerObject(ACCOUNT, "CNY", ISSUER, 20, ACCOUNT2, 100, ACCOUNT, 200, TXNID, 123), - CreateRippleStateLedgerObject(ACCOUNT, "EUR", ISSUER, 30, ACCOUNT3, 100, ACCOUNT, 200, TXNID, 123), - CreateRippleStateLedgerObject(ACCOUNT, "JPY", ISSUER, -50, ACCOUNT3, 10, ACCOUNT, 20, TXNID, 123)}, + std::vector{// hotwallet + CreateRippleStateLedgerObject("USD", ISSUER, 10, ACCOUNT2, 100, ACCOUNT, 200, TXNID, 123), + // hotwallet + CreateRippleStateLedgerObject("CNY", ISSUER, 20, ACCOUNT2, 100, ACCOUNT, 200, TXNID, 123), + CreateRippleStateLedgerObject("EUR", ISSUER, 30, ACCOUNT3, 100, ACCOUNT, 200, TXNID, 123), + CreateRippleStateLedgerObject("JPY", ISSUER, -50, ACCOUNT3, 10, ACCOUNT, 20, TXNID, 123)}, fmt::format( R"({{ "obligations":{{ @@ -575,9 +570,9 @@ generateNormalPathTestBundles() CreateOwnerDirLedgerObject( {ripple::uint256{INDEX2}, ripple::uint256{INDEX2}, ripple::uint256{INDEX2}}, INDEX1), std::vector{ - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, -10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123), - CreateRippleStateLedgerObject(ACCOUNT, "CNY", ISSUER, -20, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123), - CreateRippleStateLedgerObject(ACCOUNT, "EUR", ISSUER, -30, ACCOUNT, 100, ACCOUNT3, 200, TXNID, 123) + CreateRippleStateLedgerObject("USD", ISSUER, -10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123), + CreateRippleStateLedgerObject("CNY", ISSUER, -20, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123), + CreateRippleStateLedgerObject("EUR", ISSUER, -30, ACCOUNT, 100, ACCOUNT3, 200, TXNID, 123) }, fmt::format( diff --git a/unittests/rpc/handlers/LedgerDataTests.cpp b/unittests/rpc/handlers/LedgerDataTests.cpp index 2c9c4491..ed8c7e00 100644 --- a/unittests/rpc/handlers/LedgerDataTests.cpp +++ b/unittests/rpc/handlers/LedgerDataTests.cpp @@ -252,8 +252,7 @@ TEST_F(RPCLedgerDataHandlerTest, NoMarker) while (limitLine--) { - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); + auto const line = CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); bbs.push_back(line.getSerializer().peekData()); } @@ -315,8 +314,7 @@ TEST_F(RPCLedgerDataHandlerTest, TypeFilter) while (limitLine--) { - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); + auto const line = CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); bbs.push_back(line.getSerializer().peekData()); } @@ -381,8 +379,7 @@ TEST_F(RPCLedgerDataHandlerTest, OutOfOrder) ON_CALL(*rawBackendPtr, doFetchSuccessorKey(ripple::uint256{INDEX2}, RANGEMAX, _)) .WillByDefault(Return(std::nullopt)); - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); + auto const line = CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); bbs.push_back(line.getSerializer().peekData()); ON_CALL(*rawBackendPtr, doFetchLedgerObjects).WillByDefault(Return(bbs)); @@ -416,7 +413,7 @@ TEST_F(RPCLedgerDataHandlerTest, Marker) EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(1); ON_CALL(*rawBackendPtr, doFetchLedgerObject(ripple::uint256{INDEX1}, RANGEMAX, _)) .WillByDefault( - Return(CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123) + Return(CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123) .getSerializer() .peekData())); @@ -430,8 +427,7 @@ TEST_F(RPCLedgerDataHandlerTest, Marker) while (limit--) { - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); + auto const line = CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); bbs.push_back(line.getSerializer().peekData()); } @@ -474,8 +470,7 @@ TEST_F(RPCLedgerDataHandlerTest, DiffMarker) while (limit--) { - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); + auto const line = CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); bbs.push_back(line.getSerializer().peekData()); los.push_back(LedgerObject{ripple::uint256{INDEX2}, Blob{}}); } @@ -521,8 +516,7 @@ TEST_F(RPCLedgerDataHandlerTest, Binary) while (limit--) { - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); + auto const line = CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); bbs.push_back(line.getSerializer().peekData()); } @@ -565,8 +559,7 @@ TEST_F(RPCLedgerDataHandlerTest, BinaryLimitMoreThanMax) while (limit--) { - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); + auto const line = CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); bbs.push_back(line.getSerializer().peekData()); } @@ -610,8 +603,7 @@ TEST_F(RPCLedgerDataHandlerTest, JsonLimitMoreThanMax) while (limit--) { - auto const line = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); + auto const line = CreateRippleStateLedgerObject("USD", ACCOUNT2, 10, ACCOUNT, 100, ACCOUNT2, 200, TXNID, 123); bbs.push_back(line.getSerializer().peekData()); } diff --git a/unittests/rpc/handlers/LedgerEntryTests.cpp b/unittests/rpc/handlers/LedgerEntryTests.cpp index 1fc4b664..69f64c73 100644 --- a/unittests/rpc/handlers/LedgerEntryTests.cpp +++ b/unittests/rpc/handlers/LedgerEntryTests.cpp @@ -861,7 +861,7 @@ generateTestValuesForNormalPathTest() ACCOUNT, ACCOUNT2), ripple::keylet::line(account1, account2, currency).key, - CreateRippleStateLedgerObject(ACCOUNT, "USD", ACCOUNT2, 100, ACCOUNT, 10, ACCOUNT2, 20, INDEX1, 123, 0)}, + CreateRippleStateLedgerObject("USD", ACCOUNT2, 100, ACCOUNT, 10, ACCOUNT2, 20, INDEX1, 123, 0)}, NormalPathTestBundle{ "Ticket", fmt::format( diff --git a/unittests/rpc/handlers/LedgerTests.cpp b/unittests/rpc/handlers/LedgerTests.cpp index c4c5c9c8..7d4f7c47 100644 --- a/unittests/rpc/handlers/LedgerTests.cpp +++ b/unittests/rpc/handlers/LedgerTests.cpp @@ -1035,8 +1035,8 @@ TEST_F(RPCLedgerHandlerTest, OwnerFundsNotXRP) ON_CALL(*rawBackendPtr, fetchLedgerBySequence(RANGEMAX, _)).WillByDefault(Return(ledgerinfo)); // mock line - auto const line = CreateRippleStateLedgerObject( - ACCOUNT, CURRENCY, ACCOUNT2, 50 /*balance*/, ACCOUNT, 10, ACCOUNT2, 20, INDEX1, 123); + auto const line = + CreateRippleStateLedgerObject(CURRENCY, ACCOUNT2, 50 /*balance*/, ACCOUNT, 10, ACCOUNT2, 20, INDEX1, 123); auto lineKey = ripple::keylet::line( GetAccountIDWithString(ACCOUNT), GetAccountIDWithString(ACCOUNT2), @@ -1090,7 +1090,6 @@ TEST_F(RPCLedgerHandlerTest, OwnerFundsIgnoreFreezeLine) // mock line freeze auto const line = CreateRippleStateLedgerObject( - ACCOUNT, CURRENCY, ACCOUNT2, 50 /*balance*/, diff --git a/unittests/rpc/handlers/NoRippleCheckTests.cpp b/unittests/rpc/handlers/NoRippleCheckTests.cpp index 24ee5e74..5df42c87 100644 --- a/unittests/rpc/handlers/NoRippleCheckTests.cpp +++ b/unittests/rpc/handlers/NoRippleCheckTests.cpp @@ -332,10 +332,10 @@ TEST_F(RPCNoRippleCheckTest, NormalPathRoleUserDefaultRippleSetTrustLineNoRipple EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(2); auto const line1 = CreateRippleStateLedgerObject( - ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); + "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); auto const line2 = CreateRippleStateLedgerObject( - ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); + "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); std::vector bbs; bbs.push_back(line1.getSerializer().peekData()); @@ -389,11 +389,9 @@ TEST_F(RPCNoRippleCheckTest, NormalPathRoleUserDefaultRippleUnsetTrustLineNoRipp .WillByDefault(Return(ownerDir.getSerializer().peekData())); EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(2); - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); - auto const line2 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line2 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); std::vector bbs; bbs.push_back(line1.getSerializer().peekData()); @@ -451,10 +449,10 @@ TEST_F(RPCNoRippleCheckTest, NormalPathRoleGatewayDefaultRippleSetTrustLineNoRip EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(2); auto const line1 = CreateRippleStateLedgerObject( - ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); + "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); auto const line2 = CreateRippleStateLedgerObject( - ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); + "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); std::vector bbs; bbs.push_back(line1.getSerializer().peekData()); @@ -508,11 +506,9 @@ TEST_F(RPCNoRippleCheckTest, NormalPathRoleGatewayDefaultRippleUnsetTrustLineNoR .WillByDefault(Return(ownerDir.getSerializer().peekData())); EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(2); - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); - auto const line2 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); + auto const line2 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, 0); std::vector bbs; bbs.push_back(line1.getSerializer().peekData()); @@ -558,11 +554,9 @@ TEST_F(RPCNoRippleCheckTest, NormalPathRoleGatewayDefaultRippleUnsetTrustLineNoR .WillByDefault(Return(CreateFeeSettingBlob(1, 2, 3, 4, 0))); EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(3); - auto const line1 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT2, 10, ACCOUNT, 20, TXNID, 123, 0); + auto const line1 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT2, 10, ACCOUNT, 20, TXNID, 123, 0); - auto const line2 = - CreateRippleStateLedgerObject(ACCOUNT, "USD", ISSUER, 100, ACCOUNT2, 10, ACCOUNT, 20, TXNID, 123, 0); + auto const line2 = CreateRippleStateLedgerObject("USD", ISSUER, 100, ACCOUNT2, 10, ACCOUNT, 20, TXNID, 123, 0); std::vector bbs; bbs.push_back(line1.getSerializer().peekData()); @@ -611,10 +605,10 @@ TEST_F(RPCNoRippleCheckTest, NormalPathLimit) EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(2); auto const line1 = CreateRippleStateLedgerObject( - ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); + "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); auto const line2 = CreateRippleStateLedgerObject( - ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); + "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); std::vector bbs; bbs.push_back(line1.getSerializer().peekData()); @@ -713,10 +707,10 @@ TEST_F(RPCNoRippleCheckTest, NormalPathTransactions) EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(3); auto const line1 = CreateRippleStateLedgerObject( - ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); + "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); auto const line2 = CreateRippleStateLedgerObject( - ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); + "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); std::vector bbs; bbs.push_back(line1.getSerializer().peekData()); @@ -765,7 +759,7 @@ TEST_F(RPCNoRippleCheckTest, LimitMoreThanMax) EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(2); auto const line1 = CreateRippleStateLedgerObject( - ACCOUNT, "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); + "USD", ISSUER, 100, ACCOUNT, 10, ACCOUNT2, 20, TXNID, 123, ripple::lsfLowNoRipple); std::vector bbs; for (auto i = 0; i < NoRippleCheckHandler::LIMIT_MAX + 1; i++) diff --git a/unittests/rpc/handlers/ServerInfoTests.cpp b/unittests/rpc/handlers/ServerInfoTests.cpp index b14b1090..01c82c74 100644 --- a/unittests/rpc/handlers/ServerInfoTests.cpp +++ b/unittests/rpc/handlers/ServerInfoTests.cpp @@ -190,9 +190,9 @@ TEST_F(RPCServerInfoHandlerTest, NoFeesErrorsOutWithInternal) TEST_F(RPCServerInfoHandlerTest, DefaultOutputIsPresent) { MockBackend* rawBackendPtr = static_cast(mockBackendPtr.get()); - MockLoadBalancer* rawBalancerPtr = static_cast(mockLoadBalancerPtr.get()); - MockCounters* rawCountersPtr = static_cast(mockCountersPtr.get()); - MockETLService* rawETLServicePtr = static_cast(mockETLServicePtr.get()); + MockLoadBalancer* rawBalancerPtr = mockLoadBalancerPtr.get(); + MockCounters* rawCountersPtr = mockCountersPtr.get(); + MockETLService* rawETLServicePtr = mockETLServicePtr.get(); mockBackendPtr->updateRange(10); // min mockBackendPtr->updateRange(30); // max @@ -234,9 +234,9 @@ TEST_F(RPCServerInfoHandlerTest, DefaultOutputIsPresent) TEST_F(RPCServerInfoHandlerTest, AmendmentBlockedIsPresentIfSet) { MockBackend* rawBackendPtr = static_cast(mockBackendPtr.get()); - MockLoadBalancer* rawBalancerPtr = static_cast(mockLoadBalancerPtr.get()); - MockCounters* rawCountersPtr = static_cast(mockCountersPtr.get()); - MockETLService* rawETLServicePtr = static_cast(mockETLServicePtr.get()); + MockLoadBalancer* rawBalancerPtr = mockLoadBalancerPtr.get(); + MockCounters* rawCountersPtr = mockCountersPtr.get(); + MockETLService* rawETLServicePtr = mockETLServicePtr.get(); mockBackendPtr->updateRange(10); // min mockBackendPtr->updateRange(30); // max @@ -276,11 +276,10 @@ TEST_F(RPCServerInfoHandlerTest, AmendmentBlockedIsPresentIfSet) TEST_F(RPCServerInfoHandlerTest, AdminSectionPresentWhenAdminFlagIsSet) { MockBackend* rawBackendPtr = static_cast(mockBackendPtr.get()); - MockLoadBalancer* rawBalancerPtr = static_cast(mockLoadBalancerPtr.get()); - MockCounters* rawCountersPtr = static_cast(mockCountersPtr.get()); - MockSubscriptionManager* rawSubscriptionManagerPtr = - static_cast(mockSubscriptionManagerPtr.get()); - MockETLService* rawETLServicePtr = static_cast(mockETLServicePtr.get()); + MockLoadBalancer* rawBalancerPtr = mockLoadBalancerPtr.get(); + MockCounters* rawCountersPtr = mockCountersPtr.get(); + MockSubscriptionManager* rawSubscriptionManagerPtr = mockSubscriptionManagerPtr.get(); + MockETLService* rawETLServicePtr = mockETLServicePtr.get(); mockBackendPtr->updateRange(10); // min mockBackendPtr->updateRange(30); // max @@ -328,11 +327,10 @@ TEST_F(RPCServerInfoHandlerTest, AdminSectionPresentWhenAdminFlagIsSet) TEST_F(RPCServerInfoHandlerTest, RippledForwardedValuesPresent) { MockBackend* rawBackendPtr = static_cast(mockBackendPtr.get()); - MockLoadBalancer* rawBalancerPtr = static_cast(mockLoadBalancerPtr.get()); - MockCounters* rawCountersPtr = static_cast(mockCountersPtr.get()); - MockSubscriptionManager* rawSubscriptionManagerPtr = - static_cast(mockSubscriptionManagerPtr.get()); - MockETLService* rawETLServicePtr = static_cast(mockETLServicePtr.get()); + MockLoadBalancer* rawBalancerPtr = mockLoadBalancerPtr.get(); + MockCounters* rawCountersPtr = mockCountersPtr.get(); + MockSubscriptionManager* rawSubscriptionManagerPtr = mockSubscriptionManagerPtr.get(); + MockETLService* rawETLServicePtr = mockETLServicePtr.get(); mockBackendPtr->updateRange(10); // min mockBackendPtr->updateRange(30); // max @@ -391,11 +389,10 @@ TEST_F(RPCServerInfoHandlerTest, RippledForwardedValuesPresent) TEST_F(RPCServerInfoHandlerTest, RippledForwardedValuesMissingNoExceptionThrown) { MockBackend* rawBackendPtr = static_cast(mockBackendPtr.get()); - MockLoadBalancer* rawBalancerPtr = static_cast(mockLoadBalancerPtr.get()); - MockCounters* rawCountersPtr = static_cast(mockCountersPtr.get()); - MockSubscriptionManager* rawSubscriptionManagerPtr = - static_cast(mockSubscriptionManagerPtr.get()); - MockETLService* rawETLServicePtr = static_cast(mockETLServicePtr.get()); + MockLoadBalancer* rawBalancerPtr = mockLoadBalancerPtr.get(); + MockCounters* rawCountersPtr = mockCountersPtr.get(); + MockSubscriptionManager* rawSubscriptionManagerPtr = mockSubscriptionManagerPtr.get(); + MockETLService* rawETLServicePtr = mockETLServicePtr.get(); mockBackendPtr->updateRange(10); // min mockBackendPtr->updateRange(30); // max diff --git a/unittests/rpc/handlers/UnsubscribeTests.cpp b/unittests/rpc/handlers/UnsubscribeTests.cpp index b328cd37..975e3f68 100644 --- a/unittests/rpc/handlers/UnsubscribeTests.cpp +++ b/unittests/rpc/handlers/UnsubscribeTests.cpp @@ -521,8 +521,7 @@ TEST_F(RPCUnsubscribeTest, Streams) "streams": ["transactions_proposed","transactions","validations","manifests","book_changes","ledger"] })"); - MockSubscriptionManager* rawSubscriptionManagerPtr = - static_cast(mockSubscriptionManagerPtr.get()); + MockSubscriptionManager* rawSubscriptionManagerPtr = mockSubscriptionManagerPtr.get(); EXPECT_CALL(*rawSubscriptionManagerPtr, unsubLedger).Times(1); EXPECT_CALL(*rawSubscriptionManagerPtr, unsubTransactions).Times(1); EXPECT_CALL(*rawSubscriptionManagerPtr, unsubValidation).Times(1); @@ -547,8 +546,7 @@ TEST_F(RPCUnsubscribeTest, Accounts) ACCOUNT, ACCOUNT2)); - MockSubscriptionManager* rawSubscriptionManagerPtr = - static_cast(mockSubscriptionManagerPtr.get()); + MockSubscriptionManager* rawSubscriptionManagerPtr = mockSubscriptionManagerPtr.get(); EXPECT_CALL(*rawSubscriptionManagerPtr, unsubAccount(rpc::accountFromStringStrict(ACCOUNT).value(), _)).Times(1); EXPECT_CALL(*rawSubscriptionManagerPtr, unsubAccount(rpc::accountFromStringStrict(ACCOUNT2).value(), _)).Times(1); @@ -569,8 +567,7 @@ TEST_F(RPCUnsubscribeTest, AccountsProposed) ACCOUNT, ACCOUNT2)); - MockSubscriptionManager* rawSubscriptionManagerPtr = - static_cast(mockSubscriptionManagerPtr.get()); + MockSubscriptionManager* rawSubscriptionManagerPtr = mockSubscriptionManagerPtr.get(); EXPECT_CALL(*rawSubscriptionManagerPtr, unsubProposedAccount(rpc::accountFromStringStrict(ACCOUNT).value(), _)) .Times(1); EXPECT_CALL(*rawSubscriptionManagerPtr, unsubProposedAccount(rpc::accountFromStringStrict(ACCOUNT2).value(), _)) @@ -606,8 +603,7 @@ TEST_F(RPCUnsubscribeTest, Books) auto const parsedBookMaybe = rpc::parseBook(input.as_object().at("books").as_array()[0].as_object()); auto const book = std::get(parsedBookMaybe); - MockSubscriptionManager* rawSubscriptionManagerPtr = - static_cast(mockSubscriptionManagerPtr.get()); + MockSubscriptionManager* rawSubscriptionManagerPtr = mockSubscriptionManagerPtr.get(); EXPECT_CALL(*rawSubscriptionManagerPtr, unsubBook(book, _)).Times(1); EXPECT_CALL(*rawSubscriptionManagerPtr, unsubBook(ripple::reversed(book), _)).Times(1); @@ -640,8 +636,7 @@ TEST_F(RPCUnsubscribeTest, SingleBooks) auto const parsedBookMaybe = rpc::parseBook(input.as_object().at("books").as_array()[0].as_object()); auto const book = std::get(parsedBookMaybe); - MockSubscriptionManager* rawSubscriptionManagerPtr = - static_cast(mockSubscriptionManagerPtr.get()); + MockSubscriptionManager* rawSubscriptionManagerPtr = mockSubscriptionManagerPtr.get(); EXPECT_CALL(*rawSubscriptionManagerPtr, unsubBook(book, _)).Times(1); runSpawn([&, this](auto yield) { diff --git a/unittests/util/MockWsBase.h b/unittests/util/MockWsBase.h index 1f1b67ae..b34af734 100644 --- a/unittests/util/MockWsBase.h +++ b/unittests/util/MockWsBase.h @@ -31,7 +31,7 @@ struct MockSession : public web::ConnectionBase } void - send(std::string&& msg, boost::beast::http::status status = boost::beast::http::status::ok) override + send(std::string&& msg, boost::beast::http::status = boost::beast::http::status::ok) override { message += msg; } @@ -43,15 +43,14 @@ struct MockSession : public web::ConnectionBase struct MockDeadSession : public web::ConnectionBase { - void - send(std::shared_ptr _) override + void send(std::shared_ptr) override { // err happen, the session should remove from subscribers ec_.assign(2, boost::system::system_category()); } void - send(std::string&& _, boost::beast::http::status __ = boost::beast::http::status::ok) override + send(std::string&&, boost::beast::http::status = boost::beast::http::status::ok) override { } diff --git a/unittests/util/StringUtils.cpp b/unittests/util/StringUtils.cpp index 3e22e0f1..f4e96f70 100644 --- a/unittests/util/StringUtils.cpp +++ b/unittests/util/StringUtils.cpp @@ -37,7 +37,7 @@ ripple::uint256 binaryStringToUint256(std::string const& bin) { ripple::uint256 uint; - return uint.fromVoid((void const*)bin.data()); + return uint.fromVoid(static_cast(bin.data())); } std::string diff --git a/unittests/util/TestHttpSyncClient.h b/unittests/util/TestHttpSyncClient.h index 4197d0c9..63be86d8 100644 --- a/unittests/util/TestHttpSyncClient.h +++ b/unittests/util/TestHttpSyncClient.h @@ -22,6 +22,7 @@ #include #include #include +#include #include @@ -57,7 +58,7 @@ struct HttpSyncClient boost::beast::error_code ec; stream.socket().shutdown(tcp::socket::shutdown_both, ec); - return std::string(res.body()); + return res.body(); } }; @@ -107,7 +108,7 @@ public: struct HttpsSyncClient { static bool - verify_certificate(bool preverified, boost::asio::ssl::verify_context& ctx) + verify_certificate(bool /* preverified */, boost::asio::ssl::verify_context& /* ctx */) { return true; } @@ -123,7 +124,11 @@ struct HttpsSyncClient tcp::resolver resolver(ioc); boost::beast::ssl_stream stream(ioc, ctx); +// We can't fix this so have to ignore +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" if (!SSL_set_tlsext_host_name(stream.native_handle(), host.c_str())) +#pragma GCC diagnostic pop { boost::beast::error_code ec{static_cast(::ERR_get_error()), net::error::get_ssl_category()}; throw boost::beast::system_error{ec}; @@ -147,7 +152,7 @@ struct HttpsSyncClient boost::beast::error_code ec; stream.shutdown(ec); - return std::string(res.body()); + return res.body(); } }; diff --git a/unittests/util/TestObject.cpp b/unittests/util/TestObject.cpp index 5da5e8c0..1b2acacf 100644 --- a/unittests/util/TestObject.cpp +++ b/unittests/util/TestObject.cpp @@ -334,7 +334,6 @@ CreatePaymentChannelLedgerObject( [[nodiscard]] ripple::STObject CreateRippleStateLedgerObject( - std::string_view accountId, std::string_view currency, std::string_view issuerId, int balance, diff --git a/unittests/util/TestObject.h b/unittests/util/TestObject.h index 2c01734b..9f2739fa 100644 --- a/unittests/util/TestObject.h +++ b/unittests/util/TestObject.h @@ -172,7 +172,6 @@ CreatePaymentChannelLedgerObject( [[nodiscard]] ripple::STObject CreateRippleStateLedgerObject( - std::string_view accountId, std::string_view currency, std::string_view issuerId, int balance, diff --git a/unittests/web/ServerTests.cpp b/unittests/web/ServerTests.cpp index 8a2ad189..110ed8f4 100644 --- a/unittests/web/ServerTests.cpp +++ b/unittests/web/ServerTests.cpp @@ -174,7 +174,7 @@ public: } void - operator()(boost::beast::error_code ec, std::shared_ptr const& ws) + operator()(boost::beast::error_code /* ec */, std::shared_ptr const& /* ws */) { } }; @@ -183,13 +183,13 @@ class ExceptionExecutor { public: void - operator()(std::string const& req, std::shared_ptr const& ws) + operator()(std::string const& /* req */, std::shared_ptr const& /* ws */) { throw std::runtime_error("MyError"); } void - operator()(boost::beast::error_code ec, std::shared_ptr const& ws) + operator()(boost::beast::error_code /* ec */, std::shared_ptr const& /* ws */) { } };