From 8375eb17663f399b1ff7c22fc9a723bd1670e6af Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Oct 2025 11:20:32 +0000 Subject: [PATCH] style: clang-tidy auto fixes (#2741) Co-authored-by: godexsoft <385326+godexsoft@users.noreply.github.com> --- src/rpc/handlers/AccountMPTokenIssuances.cpp | 2 - src/rpc/handlers/AccountMPTokenIssuances.hpp | 4 +- src/rpc/handlers/AccountMPTokens.cpp | 3 +- .../handlers/AccountMPTokenIssuancesTests.cpp | 102 +++++++++--------- .../rpc/handlers/AccountMPTokensTests.cpp | 100 ++++++++--------- 5 files changed, 107 insertions(+), 104 deletions(-) diff --git a/src/rpc/handlers/AccountMPTokenIssuances.cpp b/src/rpc/handlers/AccountMPTokenIssuances.cpp index 5f22d955..fce656ad 100644 --- a/src/rpc/handlers/AccountMPTokenIssuances.cpp +++ b/src/rpc/handlers/AccountMPTokenIssuances.cpp @@ -36,9 +36,7 @@ #include #include #include -#include #include -#include #include #include diff --git a/src/rpc/handlers/AccountMPTokenIssuances.hpp b/src/rpc/handlers/AccountMPTokenIssuances.hpp index 94122c08..109eaff7 100644 --- a/src/rpc/handlers/AccountMPTokenIssuances.hpp +++ b/src/rpc/handlers/AccountMPTokenIssuances.hpp @@ -64,8 +64,8 @@ public: std::string issuer; uint32_t sequence{}; - std::optional transferFee{}; - std::optional assetScale{}; + std::optional transferFee; + std::optional assetScale; std::optional maximumAmount; std::optional outstandingAmount; diff --git a/src/rpc/handlers/AccountMPTokens.cpp b/src/rpc/handlers/AccountMPTokens.cpp index 9764aa72..762ae0a7 100644 --- a/src/rpc/handlers/AccountMPTokens.cpp +++ b/src/rpc/handlers/AccountMPTokens.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -36,9 +37,7 @@ #include #include #include -#include #include -#include #include #include diff --git a/tests/unit/rpc/handlers/AccountMPTokenIssuancesTests.cpp b/tests/unit/rpc/handlers/AccountMPTokenIssuancesTests.cpp index 8b5e5c6a..a94859f9 100644 --- a/tests/unit/rpc/handlers/AccountMPTokenIssuancesTests.cpp +++ b/tests/unit/rpc/handlers/AccountMPTokenIssuancesTests.cpp @@ -26,6 +26,7 @@ #include "util/NameGenerator.hpp" #include "util/TestObject.hpp" +#include #include #include #include @@ -40,6 +41,7 @@ #include #include +#include #include #include #include @@ -136,48 +138,48 @@ static auto generateTestValuesForInvalidParamsTest() { return std::vector{ - {"NonHexLedgerHash", - fmt::format(R"JSON({{ "account": "{}", "ledger_hash": "xxx" }})JSON", kACCOUNT), - "invalidParams", - "ledger_hashMalformed"}, - {"NonStringLedgerHash", - fmt::format(R"JSON({{ "account": "{}", "ledger_hash": 123 }})JSON", kACCOUNT), - "invalidParams", - "ledger_hashNotString"}, - {"InvalidLedgerIndexString", - fmt::format(R"JSON({{ "account": "{}", "ledger_index": "notvalidated" }})JSON", kACCOUNT), - "invalidParams", - "ledgerIndexMalformed"}, - {"MarkerNotString", - fmt::format(R"JSON({{ "account": "{}", "marker": 9 }})JSON", kACCOUNT), - "invalidParams", - "markerNotString"}, - {"InvalidMarkerContent", - fmt::format(R"JSON({{ "account": "{}", "marker": "123invalid" }})JSON", kACCOUNT), - "invalidParams", - "Malformed cursor."}, - {"AccountMissing", R"JSON({ "limit": 10 })JSON", "invalidParams", "Required field 'account' missing"}, - {"AccountNotString", R"JSON({ "account": 123 })JSON", "actMalformed", "Account malformed."}, - {"AccountMalformed", - R"JSON({ "account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jp" })JSON", - "actMalformed", - "Account malformed."}, - {"LimitNotInteger", - fmt::format(R"JSON({{ "account": "{}", "limit": "t" }})JSON", kACCOUNT), - "invalidParams", - "Invalid parameters."}, - {"LimitNegative", - fmt::format(R"JSON({{ "account": "{}", "limit": -1 }})JSON", kACCOUNT), - "invalidParams", - "Invalid parameters."}, - {"LimitZero", - fmt::format(R"JSON({{ "account": "{}", "limit": 0 }})JSON", kACCOUNT), - "invalidParams", - "Invalid parameters."}, - {"LimitTypeInvalid", - fmt::format(R"JSON({{ "account": "{}", "limit": true }})JSON", kACCOUNT), - "invalidParams", - "Invalid parameters."} + {.testName="NonHexLedgerHash", + .testJson=fmt::format(R"JSON({{ "account": "{}", "ledger_hash": "xxx" }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="ledger_hashMalformed"}, + {.testName="NonStringLedgerHash", + .testJson=fmt::format(R"JSON({{ "account": "{}", "ledger_hash": 123 }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="ledger_hashNotString"}, + {.testName="InvalidLedgerIndexString", + .testJson=fmt::format(R"JSON({{ "account": "{}", "ledger_index": "notvalidated" }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="ledgerIndexMalformed"}, + {.testName="MarkerNotString", + .testJson=fmt::format(R"JSON({{ "account": "{}", "marker": 9 }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="markerNotString"}, + {.testName="InvalidMarkerContent", + .testJson=fmt::format(R"JSON({{ "account": "{}", "marker": "123invalid" }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="Malformed cursor."}, + {.testName="AccountMissing", .testJson=R"JSON({ "limit": 10 })JSON", .expectedError="invalidParams", .expectedErrorMessage="Required field 'account' missing"}, + {.testName="AccountNotString", .testJson=R"JSON({ "account": 123 })JSON", .expectedError="actMalformed", .expectedErrorMessage="Account malformed."}, + {.testName="AccountMalformed", + .testJson=R"JSON({ "account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jp" })JSON", + .expectedError="actMalformed", + .expectedErrorMessage="Account malformed."}, + {.testName="LimitNotInteger", + .testJson=fmt::format(R"JSON({{ "account": "{}", "limit": "t" }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="Invalid parameters."}, + {.testName="LimitNegative", + .testJson=fmt::format(R"JSON({{ "account": "{}", "limit": -1 }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="Invalid parameters."}, + {.testName="LimitZero", + .testJson=fmt::format(R"JSON({{ "account": "{}", "limit": 0 }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="Invalid parameters."}, + {.testName="LimitTypeInvalid", + .testJson=fmt::format(R"JSON({{ "account": "{}", "limit": true }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="Invalid parameters."} }; } @@ -436,7 +438,7 @@ TEST_F(RPCAccountMPTokenIssuancesHandlerTest, DefaultParameters) TEST_F(RPCAccountMPTokenIssuancesHandlerTest, UseLimit) { - constexpr int limit = 20; + constexpr int kLIMIT = 20; auto ledgerHeader = createLedgerHeader(kLEDGER_HASH, 30); ON_CALL(*backend_, fetchLedgerBySequence).WillByDefault(Return(ledgerHeader)); @@ -449,7 +451,7 @@ TEST_F(RPCAccountMPTokenIssuancesHandlerTest, UseLimit) std::vector bbs; for (int i = 0; i < 50; ++i) { - indexes.emplace_back(ripple::uint256{kISSUANCE_INDEX1}); + indexes.emplace_back(kISSUANCE_INDEX1); auto const issuance = createMptIssuanceObject(kACCOUNT, i); bbs.push_back(issuance.getSerializer().peekData()); } @@ -462,7 +464,7 @@ TEST_F(RPCAccountMPTokenIssuancesHandlerTest, UseLimit) ON_CALL(*backend_, doFetchLedgerObjects).WillByDefault(Return(bbs)); EXPECT_CALL(*backend_, doFetchLedgerObjects).Times(3); - runSpawn([this, limit](auto yield) { + runSpawn([this, kLIMIT](auto yield) { auto const input = json::parse( fmt::format( R"JSON({{ @@ -470,7 +472,7 @@ TEST_F(RPCAccountMPTokenIssuancesHandlerTest, UseLimit) "limit": {} }})JSON", kACCOUNT, - limit + kLIMIT ) ); @@ -479,7 +481,7 @@ TEST_F(RPCAccountMPTokenIssuancesHandlerTest, UseLimit) ASSERT_TRUE(output); auto const resultJson = (*output.result).as_object(); - EXPECT_EQ(resultJson.at("mpt_issuances").as_array().size(), limit); + EXPECT_EQ(resultJson.at("mpt_issuances").as_array().size(), kLIMIT); ASSERT_TRUE(resultJson.contains("marker")); EXPECT_THAT(boost::json::value_to(resultJson.at("marker")), EndsWith(",0")); }); @@ -534,12 +536,14 @@ TEST_F(RPCAccountMPTokenIssuancesHandlerTest, MarkerOutput) EXPECT_CALL(*backend_, doFetchLedgerObject).Times(3); std::vector indexes; - for (int i = 0; i < 10; ++i) { + indexes.reserve(10); +for (int i = 0; i < 10; ++i) { indexes.emplace_back(kISSUANCE_INDEX1); } std::vector bbs; - for (int i = 0; i < kLIMIT; ++i) { + bbs.reserve(kLIMIT); +for (int i = 0; i < kLIMIT; ++i) { bbs.push_back(createMptIssuanceObject(kACCOUNT, i).getSerializer().peekData()); } EXPECT_CALL(*backend_, doFetchLedgerObjects).WillOnce(Return(bbs)); diff --git a/tests/unit/rpc/handlers/AccountMPTokensTests.cpp b/tests/unit/rpc/handlers/AccountMPTokensTests.cpp index fbfa9731..89cda316 100644 --- a/tests/unit/rpc/handlers/AccountMPTokensTests.cpp +++ b/tests/unit/rpc/handlers/AccountMPTokensTests.cpp @@ -112,48 +112,48 @@ static auto generateTestValuesForInvalidParamsTest() { return std::vector{ - {"NonHexLedgerHash", - fmt::format(R"JSON({{ "account": "{}", "ledger_hash": "xxx" }})JSON", kACCOUNT), - "invalidParams", - "ledger_hashMalformed"}, - {"NonStringLedgerHash", - fmt::format(R"JSON({{ "account": "{}", "ledger_hash": 123 }})JSON", kACCOUNT), - "invalidParams", - "ledger_hashNotString"}, - {"InvalidLedgerIndexString", - fmt::format(R"JSON({{ "account": "{}", "ledger_index": "notvalidated" }})JSON", kACCOUNT), - "invalidParams", - "ledgerIndexMalformed"}, - {"MarkerNotString", - fmt::format(R"JSON({{ "account": "{}", "marker": 9 }})JSON", kACCOUNT), - "invalidParams", - "markerNotString"}, - {"InvalidMarkerContent", - fmt::format(R"JSON({{ "account": "{}", "marker": "123invalid" }})JSON", kACCOUNT), - "invalidParams", - "Malformed cursor."}, - {"AccountMissing", R"JSON({ "limit": 10 })JSON", "invalidParams", "Required field 'account' missing"}, - {"AccountNotString", R"JSON({ "account": 123 })JSON", "actMalformed", "Account malformed."}, - {"AccountMalformed", - fmt::format(R"JSON({{ "account": "{}" }})JSON", "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jp"), - "actMalformed", - "Account malformed."}, - {"LimitNotInteger", - fmt::format(R"JSON({{ "account": "{}", "limit": "t" }})JSON", kACCOUNT), - "invalidParams", - "Invalid parameters."}, - {"LimitNegative", - fmt::format(R"JSON({{ "account": "{}", "limit": -1 }})JSON", kACCOUNT), - "invalidParams", - "Invalid parameters."}, - {"LimitZero", - fmt::format(R"JSON({{ "account": "{}", "limit": 0 }})JSON", kACCOUNT), - "invalidParams", - "Invalid parameters."}, - {"LimitTypeInvalid", - fmt::format(R"JSON({{ "account": "{}", "limit": true }})JSON", kACCOUNT), - "invalidParams", - "Invalid parameters."} + {.testName="NonHexLedgerHash", + .testJson=fmt::format(R"JSON({{ "account": "{}", "ledger_hash": "xxx" }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="ledger_hashMalformed"}, + {.testName="NonStringLedgerHash", + .testJson=fmt::format(R"JSON({{ "account": "{}", "ledger_hash": 123 }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="ledger_hashNotString"}, + {.testName="InvalidLedgerIndexString", + .testJson=fmt::format(R"JSON({{ "account": "{}", "ledger_index": "notvalidated" }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="ledgerIndexMalformed"}, + {.testName="MarkerNotString", + .testJson=fmt::format(R"JSON({{ "account": "{}", "marker": 9 }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="markerNotString"}, + {.testName="InvalidMarkerContent", + .testJson=fmt::format(R"JSON({{ "account": "{}", "marker": "123invalid" }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="Malformed cursor."}, + {.testName="AccountMissing", .testJson=R"JSON({ "limit": 10 })JSON", .expectedError="invalidParams", .expectedErrorMessage="Required field 'account' missing"}, + {.testName="AccountNotString", .testJson=R"JSON({ "account": 123 })JSON", .expectedError="actMalformed", .expectedErrorMessage="Account malformed."}, + {.testName="AccountMalformed", + .testJson=fmt::format(R"JSON({{ "account": "{}" }})JSON", "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jp"), + .expectedError="actMalformed", + .expectedErrorMessage="Account malformed."}, + {.testName="LimitNotInteger", + .testJson=fmt::format(R"JSON({{ "account": "{}", "limit": "t" }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="Invalid parameters."}, + {.testName="LimitNegative", + .testJson=fmt::format(R"JSON({{ "account": "{}", "limit": -1 }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="Invalid parameters."}, + {.testName="LimitZero", + .testJson=fmt::format(R"JSON({{ "account": "{}", "limit": 0 }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="Invalid parameters."}, + {.testName="LimitTypeInvalid", + .testJson=fmt::format(R"JSON({{ "account": "{}", "limit": true }})JSON", kACCOUNT), + .expectedError="invalidParams", + .expectedErrorMessage="Invalid parameters."} }; } @@ -388,7 +388,7 @@ TEST_F(RPCAccountMPTokensHandlerTest, DefaultParameters) TEST_F(RPCAccountMPTokensHandlerTest, UseLimit) { - constexpr int limit = 20; + constexpr int kLIMIT = 20; auto ledgerHeader = createLedgerHeader(kLEDGER_HASH, 30); ON_CALL(*backend_, fetchLedgerBySequence).WillByDefault(Return(ledgerHeader)); @@ -401,7 +401,7 @@ TEST_F(RPCAccountMPTokensHandlerTest, UseLimit) std::vector bbs; for (int i = 0; i < 50; ++i) { - indexes.emplace_back(ripple::uint256{kTOKEN_INDEX1}); + indexes.emplace_back(kTOKEN_INDEX1); auto const token = createMpTokenObject(kACCOUNT, ripple::uint192(kISSUANCE_ID_HEX), i, 0, std::nullopt); bbs.push_back(token.getSerializer().peekData()); } @@ -414,7 +414,7 @@ TEST_F(RPCAccountMPTokensHandlerTest, UseLimit) ON_CALL(*backend_, doFetchLedgerObjects).WillByDefault(Return(bbs)); EXPECT_CALL(*backend_, doFetchLedgerObjects).Times(3); - runSpawn([this, limit](auto yield) { + runSpawn([this, kLIMIT](auto yield) { auto const input = json::parse( fmt::format( R"JSON({{ @@ -422,7 +422,7 @@ TEST_F(RPCAccountMPTokensHandlerTest, UseLimit) "limit": {} }})JSON", kACCOUNT, - limit + kLIMIT ) ); @@ -431,7 +431,7 @@ TEST_F(RPCAccountMPTokensHandlerTest, UseLimit) ASSERT_TRUE(output); auto const resultJson = (*output.result).as_object(); - EXPECT_EQ(resultJson.at("mptokens").as_array().size(), limit); + EXPECT_EQ(resultJson.at("mptokens").as_array().size(), kLIMIT); ASSERT_TRUE(resultJson.contains("marker")); EXPECT_THAT(boost::json::value_to(resultJson.at("marker")), EndsWith(",0")); }); @@ -487,7 +487,8 @@ TEST_F(RPCAccountMPTokensHandlerTest, MarkerOutput) ON_CALL(*backend_, doFetchLedgerObject(accountKk, _, _)).WillByDefault(Return(Blob{'f', 'a', 'k', 'e'})); std::vector bbs; - for (int i = 0; i < kLIMIT; ++i) { + bbs.reserve(kLIMIT); +for (int i = 0; i < kLIMIT; ++i) { bbs.push_back(createMpTokenObject(kACCOUNT, ripple::uint192(kISSUANCE_ID_HEX), i, 0, std::nullopt) .getSerializer() .peekData()); @@ -495,7 +496,8 @@ TEST_F(RPCAccountMPTokensHandlerTest, MarkerOutput) EXPECT_CALL(*backend_, doFetchLedgerObjects).WillOnce(Return(bbs)); std::vector indexes1; - for (int i = 0; i < 10; ++i) { + indexes1.reserve(10); +for (int i = 0; i < 10; ++i) { indexes1.emplace_back(kTOKEN_INDEX1); } ripple::STObject ownerDir1 = createOwnerDirLedgerObject(indexes1, kTOKEN_INDEX1);