From cc4f204d9e78eb99e9493cae906f0dd3f26a31de Mon Sep 17 00:00:00 2001 From: Alex Kremer Date: Tue, 19 May 2026 15:25:47 +0100 Subject: [PATCH] style: More clang-tidy identifier renaming (#3076) --- .clang-tidy | 3 +++ src/rpc/handlers/AccountMPTokenIssuances.cpp | 4 ++-- src/rpc/handlers/AccountMPTokenIssuances.hpp | 2 +- src/rpc/handlers/AccountMPTokens.cpp | 12 ++++++------ src/rpc/handlers/AccountMPTokens.hpp | 6 +++--- src/util/log/Logger.cpp | 8 ++++---- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 4f4405224..44042fee5 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -189,8 +189,11 @@ CheckOptions: readability-identifier-naming.ParameterCase: camelBack readability-identifier-naming.FunctionCase: camelBack readability-identifier-naming.MemberCase: camelBack + readability-identifier-naming.PrivateMemberCase: camelBack readability-identifier-naming.PrivateMemberSuffix: _ + readability-identifier-naming.ProtectedMemberCase: camelBack readability-identifier-naming.ProtectedMemberSuffix: _ + readability-identifier-naming.PublicMemberCase: camelBack readability-identifier-naming.PublicMemberSuffix: "" readability-identifier-naming.FunctionIgnoredRegexp: ".*tag_invoke.*" diff --git a/src/rpc/handlers/AccountMPTokenIssuances.cpp b/src/rpc/handlers/AccountMPTokenIssuances.cpp index 671ba38db..edb1e06ac 100644 --- a/src/rpc/handlers/AccountMPTokenIssuances.cpp +++ b/src/rpc/handlers/AccountMPTokenIssuances.cpp @@ -37,7 +37,7 @@ AccountMPTokenIssuancesHandler::addMPTokenIssuance( { MPTokenIssuanceResponse issuance; - issuance.MPTokenIssuanceID = ripple::strHex(sle.key()); + issuance.mpTokenIssuanceId = ripple::strHex(sle.key()); issuance.issuer = ripple::to_string(account); issuance.sequence = sle.getFieldU32(ripple::sfSequence); auto const flags = sle.getFieldU32(ripple::sfFlags); @@ -225,7 +225,7 @@ tag_invoke( ) { auto obj = boost::json::object{ - {JS(mpt_issuance_id), issuance.MPTokenIssuanceID}, + {JS(mpt_issuance_id), issuance.mpTokenIssuanceId}, {JS(issuer), issuance.issuer}, {JS(sequence), issuance.sequence}, }; diff --git a/src/rpc/handlers/AccountMPTokenIssuances.hpp b/src/rpc/handlers/AccountMPTokenIssuances.hpp index deca986d4..33cf16d89 100644 --- a/src/rpc/handlers/AccountMPTokenIssuances.hpp +++ b/src/rpc/handlers/AccountMPTokenIssuances.hpp @@ -42,7 +42,7 @@ public: * @brief A struct to hold data for one MPTokenIssuance response. */ struct MPTokenIssuanceResponse { - std::string MPTokenIssuanceID; + std::string mpTokenIssuanceId; std::string issuer; uint32_t sequence{}; diff --git a/src/rpc/handlers/AccountMPTokens.cpp b/src/rpc/handlers/AccountMPTokens.cpp index ddec96c9e..9356b10ca 100644 --- a/src/rpc/handlers/AccountMPTokens.cpp +++ b/src/rpc/handlers/AccountMPTokens.cpp @@ -35,10 +35,10 @@ AccountMPTokensHandler::addMPToken(std::vector& mpts, ripple::S MPTokenResponse token{}; auto const flags = sle.getFieldU32(ripple::sfFlags); - token.MPTokenID = ripple::strHex(sle.key()); + token.mpTokenId = ripple::strHex(sle.key()); token.account = ripple::to_string(sle.getAccountID(ripple::sfAccount)); - token.MPTokenIssuanceID = ripple::strHex(sle.getFieldH192(ripple::sfMPTokenIssuanceID)); - token.MPTAmount = sle.getFieldU64(ripple::sfMPTAmount); + token.mpTokenIssuanceId = ripple::strHex(sle.getFieldH192(ripple::sfMPTokenIssuanceID)); + token.mptAmount = sle.getFieldU64(ripple::sfMPTAmount); if (sle.isFieldPresent(ripple::sfLockedAmount)) token.lockedAmount = sle.getFieldU64(ripple::sfLockedAmount); @@ -177,10 +177,10 @@ tag_invoke( ) { auto obj = boost::json::object{ - {"mpt_id", mptoken.MPTokenID}, + {"mpt_id", mptoken.mpTokenId}, {JS(account), mptoken.account}, - {JS(mpt_issuance_id), mptoken.MPTokenIssuanceID}, - {JS(mpt_amount), mptoken.MPTAmount}, + {JS(mpt_issuance_id), mptoken.mpTokenIssuanceId}, + {JS(mpt_amount), mptoken.mptAmount}, }; auto const setIfPresent = [&](boost::json::string_view field, auto const& value) { diff --git a/src/rpc/handlers/AccountMPTokens.hpp b/src/rpc/handlers/AccountMPTokens.hpp index c00e62d7e..8513ebcad 100644 --- a/src/rpc/handlers/AccountMPTokens.hpp +++ b/src/rpc/handlers/AccountMPTokens.hpp @@ -41,10 +41,10 @@ public: * @brief A struct to hold data for one MPToken response. */ struct MPTokenResponse { - std::string MPTokenID; + std::string mpTokenId; std::string account; - std::string MPTokenIssuanceID; - uint64_t MPTAmount{}; + std::string mpTokenIssuanceId; + uint64_t mptAmount{}; std::optional lockedAmount; std::optional mptLocked; diff --git a/src/util/log/Logger.cpp b/src/util/log/Logger.cpp index a97b77e58..869947500 100644 --- a/src/util/log/Logger.cpp +++ b/src/util/log/Logger.cpp @@ -119,7 +119,7 @@ getSeverityLevel(std::string_view logLevel) class NonCriticalFormatter : public spdlog::formatter { public: NonCriticalFormatter(std::unique_ptr wrappedFormatter) - : wrapped_formatter_(std::move(wrappedFormatter)) + : wrappedFormatter_(std::move(wrappedFormatter)) { } @@ -128,18 +128,18 @@ public: { // Only format messages with severity less than critical if (msg.level != spdlog::level::critical) { - wrapped_formatter_->format(msg, dest); + wrappedFormatter_->format(msg, dest); } } [[nodiscard]] std::unique_ptr clone() const override { - return std::make_unique(wrapped_formatter_->clone()); + return std::make_unique(wrappedFormatter_->clone()); } private: - std::unique_ptr wrapped_formatter_; + std::unique_ptr wrappedFormatter_; }; /**