From dc2430ea86bd1cfa5f97f30cb3f32a6a0159904d Mon Sep 17 00:00:00 2001 From: Mayukha Vadari Date: Tue, 21 Apr 2026 15:22:12 -0400 Subject: [PATCH] fix clang-tidy issues --- include/xrpl/basics/Buffer.h | 2 +- src/libxrpl/ledger/helpers/AMMHelpers.cpp | 2 ++ src/libxrpl/ledger/helpers/NFTokenHelpers.cpp | 3 +++ src/libxrpl/ledger/helpers/OfferHelpers.cpp | 2 ++ src/libxrpl/ledger/helpers/RippleStateHelpers.cpp | 5 +++-- src/libxrpl/ledger/helpers/TokenHelpers.cpp | 2 +- src/libxrpl/tx/Transactor.cpp | 2 ++ src/libxrpl/tx/invariants/LoanInvariant.cpp | 4 ---- src/libxrpl/tx/paths/MPTEndpointStep.cpp | 1 - src/libxrpl/tx/transactors/account/AccountSet.cpp | 2 ++ src/libxrpl/tx/transactors/account/SignerListSet.cpp | 2 +- src/libxrpl/tx/transactors/check/CheckCreate.cpp | 1 - src/libxrpl/tx/transactors/dex/OfferCreate.cpp | 1 - src/libxrpl/tx/transactors/lending/LendingHelpers.cpp | 5 +++++ src/libxrpl/tx/transactors/lending/LoanDelete.cpp | 3 +++ src/libxrpl/tx/transactors/nft/NFTokenMint.cpp | 1 + src/libxrpl/tx/transactors/nft/NFTokenModify.cpp | 1 - src/libxrpl/tx/transactors/payment/Payment.cpp | 1 - .../tx/transactors/payment_channel/PaymentChannelClaim.cpp | 1 - .../tx/transactors/payment_channel/PaymentChannelFund.cpp | 1 - src/libxrpl/tx/transactors/system/LedgerStateFix.cpp | 1 - src/libxrpl/tx/transactors/vault/VaultClawback.cpp | 2 ++ src/xrpld/rpc/handlers/account/NoRippleCheck.cpp | 1 - src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp | 1 + 24 files changed, 29 insertions(+), 18 deletions(-) diff --git a/include/xrpl/basics/Buffer.h b/include/xrpl/basics/Buffer.h index 02926e9420..52c092981c 100644 --- a/include/xrpl/basics/Buffer.h +++ b/include/xrpl/basics/Buffer.h @@ -92,7 +92,7 @@ public: { // Ensure the slice isn't a subset of the buffer. XRPL_ASSERT( - s.size() == 0 || size_ == 0 || s.data() < p_.get() || s.data() >= p_.get() + size_, + s.empty() || size_ == 0 || s.data() < p_.get() || s.data() >= p_.get() + size_, "xrpl::Buffer::operator=(Slice) : input not a subset"); if (auto p = alloc(s.size())) diff --git a/src/libxrpl/ledger/helpers/AMMHelpers.cpp b/src/libxrpl/ledger/helpers/AMMHelpers.cpp index 351ee38bf7..593c35b1a0 100644 --- a/src/libxrpl/ledger/helpers/AMMHelpers.cpp +++ b/src/libxrpl/ledger/helpers/AMMHelpers.cpp @@ -31,6 +31,8 @@ #include #include +#include "xrpl/ledger/helpers/AccountRootHelpers.h" + #include #include #include diff --git a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp index e8d4e30fb4..eb009c1e90 100644 --- a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp +++ b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp @@ -28,6 +28,9 @@ #include #include +#include "xrpl/beast/utility/Journal.h" +#include "xrpl/protocol/UintTypes.h" + #include #include #include diff --git a/src/libxrpl/ledger/helpers/OfferHelpers.cpp b/src/libxrpl/ledger/helpers/OfferHelpers.cpp index 11f383b9b8..45fce220ab 100644 --- a/src/libxrpl/ledger/helpers/OfferHelpers.cpp +++ b/src/libxrpl/ledger/helpers/OfferHelpers.cpp @@ -11,6 +11,8 @@ #include #include +#include "xrpl/protocol/LedgerFormats.h" + #include namespace xrpl { diff --git a/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp b/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp index 1e4ae6b141..d8a445ce0d 100644 --- a/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp +++ b/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp @@ -355,7 +355,7 @@ updateTrustLine( && ((flags & (!bSenderHigh ? lsfLowReserve : lsfHighReserve)) != 0u) // Sender reserve is set. && static_cast(flags & (!bSenderHigh ? lsfLowNoRipple : lsfHighNoRipple)) != - static_cast(wrappedAcct->isFlag(lsfDefaultRipple)) && + wrappedAcct->isFlag(lsfDefaultRipple) && ((flags & (!bSenderHigh ? lsfLowFreeze : lsfHighFreeze)) == 0u) && !state->getFieldAmount(!bSenderHigh ? sfLowLimit : sfHighLimit) // Sender trust limit is 0. @@ -564,7 +564,8 @@ requireAuth(ReadView const& view, Issue const& issue, AccountID const& account, // If this is a weak or legacy check, or if the account has a line, fail if // auth is required and not set on the line auto const issuerAccount = AccountRoot(issue.account, view); - if (issuerAccount.exists() && ((issuerAccount->isFlag(lsfRequireAuth)) != 0u)) + if (issuerAccount.exists() && + (static_cast(issuerAccount->isFlag(lsfRequireAuth)) != 0u)) { if (trustLine) { diff --git a/src/libxrpl/ledger/helpers/TokenHelpers.cpp b/src/libxrpl/ledger/helpers/TokenHelpers.cpp index be4b943372..ff8bb60419 100644 --- a/src/libxrpl/ledger/helpers/TokenHelpers.cpp +++ b/src/libxrpl/ledger/helpers/TokenHelpers.cpp @@ -577,7 +577,7 @@ directSendNoFeeIOU( && ((uFlags & (!bSenderHigh ? lsfLowReserve : lsfHighReserve)) != 0u) // Sender reserve is set. && static_cast(uFlags & (!bSenderHigh ? lsfLowNoRipple : lsfHighNoRipple)) != - static_cast(AccountRoot(uSenderID, view, j)->isFlag(lsfDefaultRipple)) && + AccountRoot(uSenderID, view, j)->isFlag(lsfDefaultRipple) && ((uFlags & (!bSenderHigh ? lsfLowFreeze : lsfHighFreeze)) == 0u) && !sleRippleState->getFieldAmount(!bSenderHigh ? sfLowLimit : sfHighLimit) // Sender trust limit is 0. diff --git a/src/libxrpl/tx/Transactor.cpp b/src/libxrpl/tx/Transactor.cpp index 934c223185..a1fa7813bf 100644 --- a/src/libxrpl/tx/Transactor.cpp +++ b/src/libxrpl/tx/Transactor.cpp @@ -40,6 +40,8 @@ #include #include +#include "xrpl/protocol/Serializer.h" + #include #include #include diff --git a/src/libxrpl/tx/invariants/LoanInvariant.cpp b/src/libxrpl/tx/invariants/LoanInvariant.cpp index 3df5e569bb..7aea36296e 100644 --- a/src/libxrpl/tx/invariants/LoanInvariant.cpp +++ b/src/libxrpl/tx/invariants/LoanInvariant.cpp @@ -4,10 +4,6 @@ #include #include #include -#include -#include -#include -#include #include #include #include diff --git a/src/libxrpl/tx/paths/MPTEndpointStep.cpp b/src/libxrpl/tx/paths/MPTEndpointStep.cpp index 276fbebef5..103d1f6e26 100644 --- a/src/libxrpl/tx/paths/MPTEndpointStep.cpp +++ b/src/libxrpl/tx/paths/MPTEndpointStep.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libxrpl/tx/transactors/account/AccountSet.cpp b/src/libxrpl/tx/transactors/account/AccountSet.cpp index 0d63dcdfe6..a033478485 100644 --- a/src/libxrpl/tx/transactors/account/AccountSet.cpp +++ b/src/libxrpl/tx/transactors/account/AccountSet.cpp @@ -23,6 +23,8 @@ #include #include +#include "xrpl/basics/Slice.h" + #include #include diff --git a/src/libxrpl/tx/transactors/account/SignerListSet.cpp b/src/libxrpl/tx/transactors/account/SignerListSet.cpp index fb15bd1e45..d46a317321 100644 --- a/src/libxrpl/tx/transactors/account/SignerListSet.cpp +++ b/src/libxrpl/tx/transactors/account/SignerListSet.cpp @@ -251,7 +251,7 @@ SignerListSet::validateQuorumAndSignerEntries( // Make sure there are no duplicate signers. XRPL_ASSERT( - std::is_sorted(signers.begin(), signers.end()), + std::ranges::is_sorted(signers), "xrpl::SignerListSet::validateQuorumAndSignerEntries : sorted " "signers"); if (std::ranges::adjacent_find(signers) != signers.end()) diff --git a/src/libxrpl/tx/transactors/check/CheckCreate.cpp b/src/libxrpl/tx/transactors/check/CheckCreate.cpp index 6f7ff4b7e2..33a5c1c4e8 100644 --- a/src/libxrpl/tx/transactors/check/CheckCreate.cpp +++ b/src/libxrpl/tx/transactors/check/CheckCreate.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libxrpl/tx/transactors/dex/OfferCreate.cpp b/src/libxrpl/tx/transactors/dex/OfferCreate.cpp index d20a2202fd..695416d3bf 100644 --- a/src/libxrpl/tx/transactors/dex/OfferCreate.cpp +++ b/src/libxrpl/tx/transactors/dex/OfferCreate.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libxrpl/tx/transactors/lending/LendingHelpers.cpp b/src/libxrpl/tx/transactors/lending/LendingHelpers.cpp index c0641892c4..19a0dc4623 100644 --- a/src/libxrpl/tx/transactors/lending/LendingHelpers.cpp +++ b/src/libxrpl/tx/transactors/lending/LendingHelpers.cpp @@ -20,9 +20,14 @@ #include #include +#include "xrpl/protocol/AccountID.h" + #include #include #include +#include +#include +#include #include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/lending/LoanDelete.cpp b/src/libxrpl/tx/transactors/lending/LoanDelete.cpp index f3495333b5..86c6ed8f33 100644 --- a/src/libxrpl/tx/transactors/lending/LoanDelete.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanDelete.cpp @@ -11,6 +11,9 @@ #include #include +#include "xrpl/basics/Number.h" +#include "xrpl/protocol/STAmount.h" + namespace xrpl { bool diff --git a/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp b/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp index 3eb833107c..c4822ebd25 100644 --- a/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp +++ b/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/nft/NFTokenModify.cpp b/src/libxrpl/tx/transactors/nft/NFTokenModify.cpp index fa0585c98f..2e73833cdf 100644 --- a/src/libxrpl/tx/transactors/nft/NFTokenModify.cpp +++ b/src/libxrpl/tx/transactors/nft/NFTokenModify.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libxrpl/tx/transactors/payment/Payment.cpp b/src/libxrpl/tx/transactors/payment/Payment.cpp index 82cc8cd86e..96a799a3b3 100644 --- a/src/libxrpl/tx/transactors/payment/Payment.cpp +++ b/src/libxrpl/tx/transactors/payment/Payment.cpp @@ -38,7 +38,6 @@ #include #include -#include #include #include diff --git a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp index a962b6a014..38c414aed9 100644 --- a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp +++ b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp index 4f14f95f8e..115df8d552 100644 --- a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp +++ b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libxrpl/tx/transactors/system/LedgerStateFix.cpp b/src/libxrpl/tx/transactors/system/LedgerStateFix.cpp index 6c2cbfcce2..5ba5ddebfc 100644 --- a/src/libxrpl/tx/transactors/system/LedgerStateFix.cpp +++ b/src/libxrpl/tx/transactors/system/LedgerStateFix.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libxrpl/tx/transactors/vault/VaultClawback.cpp b/src/libxrpl/tx/transactors/vault/VaultClawback.cpp index 1518819bf1..a7bbd15900 100644 --- a/src/libxrpl/tx/transactors/vault/VaultClawback.cpp +++ b/src/libxrpl/tx/transactors/vault/VaultClawback.cpp @@ -22,6 +22,8 @@ #include #include +#include "xrpl/core/ServiceRegistry.h" + #include #include #include diff --git a/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp b/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp index 7a0ea8ac8d..242d6da927 100644 --- a/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp +++ b/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp b/src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp index 090a2c426d..459afa4803 100644 --- a/src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp +++ b/src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp @@ -24,6 +24,7 @@ #include #include +#include "xrpl/protocol/Feature.h" #include #include