From b153213e83445fe6953c5ca00a85fd08e1b03d11 Mon Sep 17 00:00:00 2001 From: tequ Date: Tue, 28 Apr 2026 17:20:00 +0900 Subject: [PATCH] run pre-commit --- src/libxrpl/ledger/View.cpp | 7 ++- .../ledger/helpers/AccountRootHelpers.cpp | 18 ++++-- src/libxrpl/ledger/helpers/MPTokenHelpers.cpp | 2 +- src/libxrpl/ledger/helpers/NFTokenHelpers.cpp | 6 +- .../ledger/helpers/RippleStateHelpers.cpp | 4 +- src/libxrpl/ledger/helpers/TokenHelpers.cpp | 17 +++--- src/libxrpl/tx/Transactor.cpp | 49 +++++++++------ .../tx/invariants/SponsorshipInvariant.cpp | 5 +- .../tx/transactors/Sponsor/SponsorshipSet.cpp | 41 ++++++++----- .../Sponsor/SponsorshipTransfer.cpp | 15 ++--- .../tx/transactors/account/AccountDelete.cpp | 14 +++-- .../tx/transactors/account/SignerListSet.cpp | 4 +- .../tx/transactors/bridge/XChainBridge.cpp | 4 +- .../tx/transactors/check/CheckCancel.cpp | 2 +- .../tx/transactors/check/CheckCash.cpp | 2 +- .../tx/transactors/check/CheckCreate.cpp | 2 +- .../credentials/CredentialAccept.cpp | 4 +- .../credentials/CredentialCreate.cpp | 4 +- .../tx/transactors/delegate/DelegateSet.cpp | 4 +- src/libxrpl/tx/transactors/dex/AMMCreate.cpp | 2 +- src/libxrpl/tx/transactors/dex/AMMDeposit.cpp | 2 +- .../tx/transactors/dex/AMMWithdraw.cpp | 4 +- .../tx/transactors/dex/OfferCreate.cpp | 2 +- src/libxrpl/tx/transactors/did/DIDDelete.cpp | 2 +- src/libxrpl/tx/transactors/did/DIDSet.cpp | 4 +- .../tx/transactors/escrow/EscrowCancel.cpp | 2 +- .../tx/transactors/escrow/EscrowCreate.cpp | 2 +- .../tx/transactors/escrow/EscrowFinish.cpp | 2 +- .../transactors/lending/LoanBrokerDelete.cpp | 2 +- .../tx/transactors/lending/LoanBrokerSet.cpp | 2 +- .../tx/transactors/lending/LoanDelete.cpp | 2 +- .../tx/transactors/lending/LoanSet.cpp | 2 +- .../tx/transactors/nft/NFTokenAcceptOffer.cpp | 2 +- .../tx/transactors/nft/NFTokenMint.cpp | 2 +- .../tx/transactors/oracle/OracleDelete.cpp | 2 +- .../tx/transactors/oracle/OracleSet.cpp | 13 ++-- .../tx/transactors/payment/DepositPreauth.cpp | 4 +- .../tx/transactors/payment/Payment.cpp | 4 +- .../payment_channel/PaymentChannelCreate.cpp | 2 +- .../payment_channel/PaymentChannelFund.cpp | 4 +- .../PermissionedDomainDelete.cpp | 2 +- .../PermissionedDomainSet.cpp | 4 +- .../tx/transactors/system/TicketCreate.cpp | 4 +- .../token/MPTokenIssuanceCreate.cpp | 4 +- .../token/MPTokenIssuanceDestroy.cpp | 2 +- src/libxrpl/tx/transactors/token/TrustSet.cpp | 4 +- .../tx/transactors/vault/VaultCreate.cpp | 2 +- .../tx/transactors/vault/VaultDelete.cpp | 2 +- .../tx/transactors/vault/VaultDeposit.cpp | 2 +- .../tx/transactors/vault/VaultWithdraw.cpp | 2 +- src/test/app/Invariants_test.cpp | 16 ++--- src/test/app/Oracle_test.cpp | 2 +- src/test/app/Sponsor_test.cpp | 61 +++++++++++-------- src/test/jtx/impl/sponsor.cpp | 16 ++--- src/test/jtx/owners.h | 7 ++- src/test/jtx/sponsor.h | 15 ++--- src/test/rpc/AccountObjects_test.cpp | 2 +- 57 files changed, 229 insertions(+), 185 deletions(-) diff --git a/src/libxrpl/ledger/View.cpp b/src/libxrpl/ledger/View.cpp index cdd781c072..0856f061ec 100644 --- a/src/libxrpl/ledger/View.cpp +++ b/src/libxrpl/ledger/View.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -30,7 +31,6 @@ #include #include #include -#include #include #include @@ -340,10 +340,11 @@ checkInsufficientReserve( auto const sle = view.read( keylet::sponsor(sponsorSle->getAccountID(sfAccount), accSle->getAccountID(sfAccount))); - if (!isCoSigning && !sle) { + if (!isCoSigning && !sle) + { // prefunded sponsor should have a sponsorship entry return tecINTERNAL; // LCOV_EXCL_LINE -} + } if (sle) { diff --git a/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp b/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp index 3de6f98f7f..b24b4123de 100644 --- a/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp +++ b/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp @@ -146,11 +146,14 @@ adjustSponsorOwnerCountHlp( std::uint32_t const current{(sle)->getFieldU32(sfield)}; std::uint32_t const adjusted = confineOwnerCount(current, amount, accID, j); view.adjustOwnerCountHook(accID, current, adjusted); - if (adjusted == 0) { + if (adjusted == 0) + { sle->makeFieldAbsent(sfield); - } else { + } + else + { sle->setFieldU32(sfield, adjusted); -} + } view.update(sle); } @@ -186,11 +189,14 @@ adjustOwnerCount( // payback (+) std::uint32_t const adjusted = confineOwnerCount(currentReserveCount, -amount, sponsorAccountID, j); - if (adjusted == 0) { + if (adjusted == 0) + { sponsorObjSle->makeFieldAbsent(sfReserveCount); - } else { + } + else + { sponsorObjSle->setFieldU32(sfReserveCount, adjusted); -} + } view.update(sponsorObjSle); } } diff --git a/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp b/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp index 3920db6dda..e28581a305 100644 --- a/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp +++ b/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp @@ -23,12 +23,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include diff --git a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp index cce41ccda2..4ba0513cf0 100644 --- a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp +++ b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp @@ -1,5 +1,6 @@ #include +#include #include #include #include @@ -7,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -22,15 +24,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include -#include -#include #include #include diff --git a/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp b/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp index 3061a7f0ff..30a588daac 100644 --- a/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp +++ b/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -22,11 +23,10 @@ #include #include #include +#include #include #include #include -#include -#include #include #include diff --git a/src/libxrpl/ledger/helpers/TokenHelpers.cpp b/src/libxrpl/ledger/helpers/TokenHelpers.cpp index 5d5fdfd68a..436542f9b3 100644 --- a/src/libxrpl/ledger/helpers/TokenHelpers.cpp +++ b/src/libxrpl/ledger/helpers/TokenHelpers.cpp @@ -23,10 +23,10 @@ #include #include #include +#include #include #include #include -#include #include #include @@ -38,7 +38,6 @@ namespace xrpl { // Forward declaration for function that remains in View.h/cpp - //------------------------------------------------------------------------------ // // Freeze checking (Asset-based) @@ -472,11 +471,14 @@ removeEmptyHolding( { return std::visit( [&](TIss const& issue) -> TER { - if constexpr (std::is_same_v) { + if constexpr (std::is_same_v) + { return removeEmptyHolding(view, accountID, issue, journal); - } else { + } + else + { return removeEmptyHolding(view, tx, accountID, issue, journal); -} + } }, asset.value()); } @@ -711,10 +713,11 @@ directSendNoLimitIOU( TER terResult = directSendNoFeeIOU(view, issuer, uReceiverID, saAmount, true, sponsorAccountID, j); - if (tesSUCCESS == terResult) { + if (tesSUCCESS == terResult) + { terResult = directSendNoFeeIOU(view, uSenderID, issuer, saActual, true, sponsorAccountID, j); -} + } return terResult; } diff --git a/src/libxrpl/tx/Transactor.cpp b/src/libxrpl/tx/Transactor.cpp index c989b76ff1..f6d2d7c619 100644 --- a/src/libxrpl/tx/Transactor.cpp +++ b/src/libxrpl/tx/Transactor.cpp @@ -12,12 +12,14 @@ #include // IWYU pragma: keep #include #include +#include #include #include #include #include #include #include +#include #include #include #include @@ -40,8 +42,6 @@ #include #include #include -#include -#include #include #include @@ -376,10 +376,12 @@ Transactor::checkSponsor(ReadView const& view, STTx const& tx) auto const sponsorFlags = tx.getFieldU32(sfSponsorFlags); - if (((sponsorFlags & spfSponsorFee) != 0u) && sponsorSle->isFlag(lsfSponsorshipRequireSignForFee)) + if (((sponsorFlags & spfSponsorFee) != 0u) && + sponsorSle->isFlag(lsfSponsorshipRequireSignForFee)) return terNO_SPONSORSHIP; - if (((sponsorFlags & spfSponsorReserve) != 0u) && sponsorSle->isFlag(lsfSponsorshipRequireSignForReserve)) + if (((sponsorFlags & spfSponsorReserve) != 0u) && + sponsorSle->isFlag(lsfSponsorshipRequireSignForReserve)) return terNO_SPONSORSHIP; return tesSUCCESS; @@ -484,10 +486,11 @@ Transactor::checkFee(PreclaimContext const& ctx, XRPAmount baseFee) if (!payerSle) { - if (payer.type == FeePayerType::SponsorPreFunded) { + if (payer.type == FeePayerType::SponsorPreFunded) + { // Sanity check: already checked in checkSponsor return tefINTERNAL; // LCOV_EXCL_LINE -} + } return terNO_ACCOUNT; } @@ -563,12 +566,15 @@ Transactor::payFee() auto const feeAmountAfter = sle->getFieldAmount(payer.balanceField) - feePaid; - if (feeAmountAfter == beast::zero && payer.balanceField == sfFeeAmount) { + if (feeAmountAfter == beast::zero && payer.balanceField == sfFeeAmount) + { // Because ltSponsorship.sfFeeAmount is soeOptional sle->makeFieldAbsent(payer.balanceField); - } else { + } + else + { sle->setFieldAmount(payer.balanceField, feeAmountAfter); -} + } view().update(sle); @@ -1255,12 +1261,15 @@ Transactor::reset(XRPAmount fee) // then the ledger is corrupted. Rather than make things worse we // reject the transaction. auto const feeAmountAfter = balance - fee; - if (feeAmountAfter == beast::zero && payer.balanceField == sfFeeAmount) { + if (feeAmountAfter == beast::zero && payer.balanceField == sfFeeAmount) + { // Because ltSponsorship.sfFeeAmount is soeOptional payerSle->makeFieldAbsent(payer.balanceField); - } else { + } + else + { payerSle->setFieldAmount(payer.balanceField, feeAmountAfter); -} + } TER const ter{consumeSeqProxy(txnAcct)}; XRPL_ASSERT(isTesSuccess(ter), "xrpl::Transactor::reset : result is tesSUCCESS"); @@ -1286,21 +1295,27 @@ Transactor::getFeePayer(ReadView const& view, STTx const& tx) auto const sponsorshipKeylet = keylet::sponsor(sponsorAccountID, sponseeAccountID); // if pre-funded sponsorship exists, prefer it - if (hasSponsorSignature && !view.exists(sponsorshipKeylet)) { + if (hasSponsorSignature && !view.exists(sponsorshipKeylet)) + { // co-signed return FeePayer{ - .entry=keylet::account(sponsorAccountID), .balanceField=sfBalance, .type=FeePayerType::SponsorCoSigned}; -} + .entry = keylet::account(sponsorAccountID), + .balanceField = sfBalance, + .type = FeePayerType::SponsorCoSigned}; + } // pre funded - return FeePayer{.entry=sponsorshipKeylet, .balanceField=sfFeeAmount, .type=FeePayerType::SponsorPreFunded}; + return FeePayer{ + .entry = sponsorshipKeylet, + .balanceField = sfFeeAmount, + .type = FeePayerType::SponsorPreFunded}; } auto const payerAccountKeylet = keylet::account(tx.getFeePayer()); auto const payerType = tx.isFieldPresent(sfDelegate) ? FeePayerType::Delegate : FeePayerType::Account; - return FeePayer{.entry=payerAccountKeylet, .balanceField=sfBalance, .type=payerType}; + return FeePayer{.entry = payerAccountKeylet, .balanceField = sfBalance, .type = payerType}; } // The sole purpose of this function is to provide a convenient, named diff --git a/src/libxrpl/tx/invariants/SponsorshipInvariant.cpp b/src/libxrpl/tx/invariants/SponsorshipInvariant.cpp index e49749abf8..028b3b4fde 100644 --- a/src/libxrpl/tx/invariants/SponsorshipInvariant.cpp +++ b/src/libxrpl/tx/invariants/SponsorshipInvariant.cpp @@ -1,16 +1,17 @@ #include // #include -#include -#include #include #include #include #include #include +#include #include #include #include +#include + #include #include diff --git a/src/libxrpl/tx/transactors/Sponsor/SponsorshipSet.cpp b/src/libxrpl/tx/transactors/Sponsor/SponsorshipSet.cpp index 683a4e7623..426fdfc3a8 100644 --- a/src/libxrpl/tx/transactors/Sponsor/SponsorshipSet.cpp +++ b/src/libxrpl/tx/transactors/Sponsor/SponsorshipSet.cpp @@ -1,22 +1,23 @@ #include +#include +#include +#include #include #include #include #include #include -#include -#include -#include -#include #include #include #include #include #include #include +#include #include #include + #include #include #include @@ -130,10 +131,11 @@ SponsorshipSet::checkPermission(ReadView const& view, STTx const& tx) loadGranularPermission(sle, ttSPONSORSHIP_SET, granularPermissions); auto const sponsoringFee = tx.isFieldPresent(sfFeeAmount) || tx.isFieldPresent(sfMaxFee) || - ((txFlags & (tfSponsorshipSetRequireSignForFee | tfSponsorshipClearRequireSignForFee)) != 0u); + ((txFlags & (tfSponsorshipSetRequireSignForFee | tfSponsorshipClearRequireSignForFee)) != + 0u); auto const sponsoringReserve = tx.isFieldPresent(sfReserveCount) || ((txFlags & - (tfSponsorshipSetRequireSignForReserve | tfSponsorshipClearRequireSignForReserve)) != 0u); + (tfSponsorshipSetRequireSignForReserve | tfSponsorshipClearRequireSignForReserve)) != 0u); if (sponsoringFee && !granularPermissions.contains(SponsorFee)) return terNO_DELEGATE_PERMISSION; @@ -306,11 +308,14 @@ SponsorshipSet::doApply() { (*sponsorAccSle)[sfBalance] -= feeAmountDelta; - if (*feeAmount == XRPAmount(0)) { + if (*feeAmount == XRPAmount(0)) + { (*sponsorObjSle).makeFieldAbsent(sfFeeAmount); - } else { + } + else + { (*sponsorObjSle).setFieldAmount(sfFeeAmount, *feeAmount); -} + } if (auto const ret = checkInsufficientReserve( ctx_.view(), @@ -326,20 +331,26 @@ SponsorshipSet::doApply() if (maxFee) { - if (*maxFee == XRPAmount(0)) { + if (*maxFee == XRPAmount(0)) + { (*sponsorObjSle).makeFieldAbsent(sfMaxFee); - } else { + } + else + { (*sponsorObjSle)[sfMaxFee] = *maxFee; -} + } } if (reserveCount) { - if (*reserveCount == 0) { + if (*reserveCount == 0) + { (*sponsorObjSle).makeFieldAbsent(sfReserveCount); - } else { + } + else + { (*sponsorObjSle)[sfReserveCount] = *reserveCount; -} + } } // update Flags diff --git a/src/libxrpl/tx/transactors/Sponsor/SponsorshipTransfer.cpp b/src/libxrpl/tx/transactors/Sponsor/SponsorshipTransfer.cpp index 135a79f8f7..0acfaa6f2d 100644 --- a/src/libxrpl/tx/transactors/Sponsor/SponsorshipTransfer.cpp +++ b/src/libxrpl/tx/transactors/Sponsor/SponsorshipTransfer.cpp @@ -1,22 +1,23 @@ #include -#include -#include -#include -#include -#include -#include -#include #include #include #include #include #include +#include +#include #include #include +#include #include +#include +#include +#include #include #include +#include + #include #include #include diff --git a/src/libxrpl/tx/transactors/account/AccountDelete.cpp b/src/libxrpl/tx/transactors/account/AccountDelete.cpp index 23833d1073..77164afa0c 100644 --- a/src/libxrpl/tx/transactors/account/AccountDelete.cpp +++ b/src/libxrpl/tx/transactors/account/AccountDelete.cpp @@ -416,18 +416,22 @@ AccountDelete::doApply() auto const sponsoringAccountCount = sponsorSle->getFieldU32(sfSponsoringAccountCount); - if (sponsoringAccountCount == 0) { + if (sponsoringAccountCount == 0) + { // sanity check // Since sfSponsoringAccountCount is set to soeDEFAULT, the field will not be // populated with a value of 0. return tefINTERNAL; // LCOV_EXCL_LINE -} + } - if (sponsoringAccountCount == 1) { + if (sponsoringAccountCount == 1) + { sponsorSle->makeFieldAbsent(sfSponsoringAccountCount); - } else { + } + else + { sponsorSle->setFieldU32(sfSponsoringAccountCount, sponsoringAccountCount - 1); -} + } view().update(sponsorSle); // Following line might look redundant, but without it, sfSponsor diff --git a/src/libxrpl/tx/transactors/account/SignerListSet.cpp b/src/libxrpl/tx/transactors/account/SignerListSet.cpp index 75a9e0cc7a..a61f2d0a71 100644 --- a/src/libxrpl/tx/transactors/account/SignerListSet.cpp +++ b/src/libxrpl/tx/transactors/account/SignerListSet.cpp @@ -6,8 +6,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -23,8 +25,6 @@ #include #include #include -#include -#include #include #include diff --git a/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp b/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp index 4b294af8b5..d418366359 100644 --- a/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp +++ b/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp @@ -11,8 +11,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -38,8 +40,6 @@ #include #include #include -#include -#include #include #include diff --git a/src/libxrpl/tx/transactors/check/CheckCancel.cpp b/src/libxrpl/tx/transactors/check/CheckCancel.cpp index 69a8b54b6a..6f738864e7 100644 --- a/src/libxrpl/tx/transactors/check/CheckCancel.cpp +++ b/src/libxrpl/tx/transactors/check/CheckCancel.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -12,7 +13,6 @@ #include #include #include -#include #include #include diff --git a/src/libxrpl/tx/transactors/check/CheckCash.cpp b/src/libxrpl/tx/transactors/check/CheckCash.cpp index ae6a912e0c..77de70963a 100644 --- a/src/libxrpl/tx/transactors/check/CheckCash.cpp +++ b/src/libxrpl/tx/transactors/check/CheckCash.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -28,7 +29,6 @@ #include #include #include -#include #include #include diff --git a/src/libxrpl/tx/transactors/check/CheckCreate.cpp b/src/libxrpl/tx/transactors/check/CheckCreate.cpp index 93069232ea..a2eb062423 100644 --- a/src/libxrpl/tx/transactors/check/CheckCreate.cpp +++ b/src/libxrpl/tx/transactors/check/CheckCreate.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -23,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp b/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp index b957b0ed31..c6d930155b 100644 --- a/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp +++ b/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp @@ -2,8 +2,10 @@ #include #include +#include #include #include +#include #include #include #include @@ -18,8 +20,6 @@ #include #include #include -#include -#include #include #include diff --git a/src/libxrpl/tx/transactors/credentials/CredentialCreate.cpp b/src/libxrpl/tx/transactors/credentials/CredentialCreate.cpp index b4a2b73c25..3e69879ca1 100644 --- a/src/libxrpl/tx/transactors/credentials/CredentialCreate.cpp +++ b/src/libxrpl/tx/transactors/credentials/CredentialCreate.cpp @@ -4,9 +4,11 @@ #include #include #include +#include #include #include // IWYU pragma: keep #include +#include #include #include #include @@ -20,8 +22,6 @@ #include #include #include -#include -#include #include #include diff --git a/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp b/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp index a85b9d7f1d..157aabe5a2 100644 --- a/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp +++ b/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp @@ -3,8 +3,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -15,8 +17,6 @@ #include #include #include -#include -#include #include #include diff --git a/src/libxrpl/tx/transactors/dex/AMMCreate.cpp b/src/libxrpl/tx/transactors/dex/AMMCreate.cpp index bef09c155d..2d36ddc274 100644 --- a/src/libxrpl/tx/transactors/dex/AMMCreate.cpp +++ b/src/libxrpl/tx/transactors/dex/AMMCreate.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -30,7 +31,6 @@ #include #include #include -#include #include #include diff --git a/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp b/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp index ee4cb06395..05d36f21cf 100644 --- a/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp +++ b/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -24,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp b/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp index 4957f0017a..77f5168ccf 100644 --- a/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp +++ b/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp @@ -6,10 +6,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -29,8 +31,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 f04a7b5534..e146248a4c 100644 --- a/src/libxrpl/tx/transactors/dex/OfferCreate.cpp +++ b/src/libxrpl/tx/transactors/dex/OfferCreate.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -41,7 +42,6 @@ #include #include #include -#include #include #include diff --git a/src/libxrpl/tx/transactors/did/DIDDelete.cpp b/src/libxrpl/tx/transactors/did/DIDDelete.cpp index 893f75f301..b6d7ef94b4 100644 --- a/src/libxrpl/tx/transactors/did/DIDDelete.cpp +++ b/src/libxrpl/tx/transactors/did/DIDDelete.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -15,7 +16,6 @@ #include #include #include -#include #include diff --git a/src/libxrpl/tx/transactors/did/DIDSet.cpp b/src/libxrpl/tx/transactors/did/DIDSet.cpp index 29026841d6..9c1f185015 100644 --- a/src/libxrpl/tx/transactors/did/DIDSet.cpp +++ b/src/libxrpl/tx/transactors/did/DIDSet.cpp @@ -3,8 +3,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -17,8 +19,6 @@ #include #include #include -#include -#include #include #include diff --git a/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp b/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp index 2e543b2bd6..cd69438a46 100644 --- a/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp +++ b/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -22,7 +23,6 @@ #include #include #include -#include #include #include diff --git a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp index 276b8b01e7..7d81d6923b 100644 --- a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp +++ b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -31,7 +32,6 @@ #include #include #include -#include #include #include diff --git a/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp b/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp index bbd6fdf2a5..8e5c60ce8b 100644 --- a/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp +++ b/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -29,7 +30,6 @@ #include #include #include -#include #include #include diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp index f455778865..68ef2f4652 100644 --- a/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -16,7 +17,6 @@ #include #include #include -#include #include diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp index b246544eff..3a3e8111b9 100644 --- a/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -19,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/src/libxrpl/tx/transactors/lending/LoanDelete.cpp b/src/libxrpl/tx/transactors/lending/LoanDelete.cpp index 713c370912..363f5cb12a 100644 --- a/src/libxrpl/tx/transactors/lending/LoanDelete.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanDelete.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include // IWYU pragma: keep @@ -15,7 +16,6 @@ #include #include #include -#include #include diff --git a/src/libxrpl/tx/transactors/lending/LoanSet.cpp b/src/libxrpl/tx/transactors/lending/LoanSet.cpp index 567c56b92e..38d11ae830 100644 --- a/src/libxrpl/tx/transactors/lending/LoanSet.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanSet.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -26,7 +27,6 @@ #include #include #include -#include #include #include diff --git a/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp index 9d6f03984b..b73132a6c4 100644 --- a/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp +++ b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -19,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp b/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp index 2f3654ac7a..f6e48b6663 100644 --- a/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp +++ b/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -22,7 +23,6 @@ #include #include -#include #include #include diff --git a/src/libxrpl/tx/transactors/oracle/OracleDelete.cpp b/src/libxrpl/tx/transactors/oracle/OracleDelete.cpp index db24999ecd..bc46107cf9 100644 --- a/src/libxrpl/tx/transactors/oracle/OracleDelete.cpp +++ b/src/libxrpl/tx/transactors/oracle/OracleDelete.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -12,7 +13,6 @@ #include #include #include -#include #include diff --git a/src/libxrpl/tx/transactors/oracle/OracleSet.cpp b/src/libxrpl/tx/transactors/oracle/OracleSet.cpp index 80eb80c93e..cd5bec2fba 100644 --- a/src/libxrpl/tx/transactors/oracle/OracleSet.cpp +++ b/src/libxrpl/tx/transactors/oracle/OracleSet.cpp @@ -2,8 +2,10 @@ #include #include +#include #include #include +#include #include #include #include @@ -18,8 +20,6 @@ #include #include #include -#include -#include #include #include @@ -165,11 +165,14 @@ OracleSet::preclaim(PreclaimContext const& ctx) auto const currentSponsor = getLedgerEntryReserveSponsorAccountID(sle); auto const newSponsor = getTxReserveSponsorAccountID(ctx.tx); if ((!currentSponsor && !newSponsor) || - (currentSponsor && newSponsor && *currentSponsor == *newSponsor)) { + (currentSponsor && newSponsor && *currentSponsor == *newSponsor)) + { adjustReserve = newCount - oldCount; - } else { + } + else + { adjustReserve = newCount; -} + } } else { diff --git a/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp b/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp index a39182e0f9..581bc16f13 100644 --- a/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp +++ b/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp @@ -4,9 +4,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -20,8 +22,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 82849bf8b1..da93489024 100644 --- a/src/libxrpl/tx/transactors/payment/Payment.cpp +++ b/src/libxrpl/tx/transactors/payment/Payment.cpp @@ -6,11 +6,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -36,8 +38,6 @@ #include #include #include -#include -#include #include #include diff --git a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp index f4786339c3..0cc5a448ee 100644 --- a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp +++ b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -20,7 +21,6 @@ #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 2d79b50f25..532c810481 100644 --- a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp +++ b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp @@ -4,7 +4,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -17,8 +19,6 @@ #include #include #include -#include -#include #include diff --git a/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp index 47ce12d226..40e1859697 100644 --- a/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp +++ b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -11,7 +12,6 @@ #include #include #include -#include #include diff --git a/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp index 549577869e..116cf661b9 100644 --- a/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp +++ b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp @@ -2,9 +2,11 @@ #include #include +#include #include #include #include +#include #include #include #include @@ -16,8 +18,6 @@ #include #include #include -#include -#include #include #include diff --git a/src/libxrpl/tx/transactors/system/TicketCreate.cpp b/src/libxrpl/tx/transactors/system/TicketCreate.cpp index 17da80e9ac..d521996096 100644 --- a/src/libxrpl/tx/transactors/system/TicketCreate.cpp +++ b/src/libxrpl/tx/transactors/system/TicketCreate.cpp @@ -4,8 +4,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -15,8 +17,6 @@ #include #include #include -#include -#include #include #include diff --git a/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp index 6eaac19719..c5f5f1407f 100644 --- a/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp +++ b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp @@ -6,8 +6,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -19,8 +21,6 @@ #include #include #include -#include -#include #include #include diff --git a/src/libxrpl/tx/transactors/token/MPTokenIssuanceDestroy.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceDestroy.cpp index a1ed15da74..35fc414f6a 100644 --- a/src/libxrpl/tx/transactors/token/MPTokenIssuanceDestroy.cpp +++ b/src/libxrpl/tx/transactors/token/MPTokenIssuanceDestroy.cpp @@ -1,6 +1,7 @@ #include #include +#include #include #include #include @@ -8,7 +9,6 @@ #include #include #include -#include #include diff --git a/src/libxrpl/tx/transactors/token/TrustSet.cpp b/src/libxrpl/tx/transactors/token/TrustSet.cpp index c32383d316..b57b733d5a 100644 --- a/src/libxrpl/tx/transactors/token/TrustSet.cpp +++ b/src/libxrpl/tx/transactors/token/TrustSet.cpp @@ -5,9 +5,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -25,8 +27,6 @@ #include #include #include -#include -#include #include #include diff --git a/src/libxrpl/tx/transactors/vault/VaultCreate.cpp b/src/libxrpl/tx/transactors/vault/VaultCreate.cpp index e12766d739..1b42097106 100644 --- a/src/libxrpl/tx/transactors/vault/VaultCreate.cpp +++ b/src/libxrpl/tx/transactors/vault/VaultCreate.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -24,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/src/libxrpl/tx/transactors/vault/VaultDelete.cpp b/src/libxrpl/tx/transactors/vault/VaultDelete.cpp index 4431c685c9..7920b9bdfa 100644 --- a/src/libxrpl/tx/transactors/vault/VaultDelete.cpp +++ b/src/libxrpl/tx/transactors/vault/VaultDelete.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -16,7 +17,6 @@ #include #include #include -#include #include diff --git a/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp b/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp index 5d16ecae45..1c5b929332 100644 --- a/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp +++ b/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -19,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp b/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp index 95e697ca92..86ffd25b37 100644 --- a/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp +++ b/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -20,7 +21,6 @@ #include #include #include -#include #include #include diff --git a/src/test/app/Invariants_test.cpp b/src/test/app/Invariants_test.cpp index 51d6a26dbc..cbad2ce8c0 100644 --- a/src/test/app/Invariants_test.cpp +++ b/src/test/app/Invariants_test.cpp @@ -1771,20 +1771,20 @@ class Invariants_test : public beast::unit_test::suite .func = [](SLE::pointer& sle) { sle->at(sfRegularKey) = Account("regular").id(); }, }, { - .expectedFailure="pseudo-account has a sponsorship field", - .func=[](SLE::pointer& sle) { sle->at(sfSponsoredOwnerCount) = 1; }, + .expectedFailure = "pseudo-account has a sponsorship field", + .func = [](SLE::pointer& sle) { sle->at(sfSponsoredOwnerCount) = 1; }, }, { - .expectedFailure="pseudo-account has a sponsorship field", - .func=[](SLE::pointer& sle) { sle->at(sfSponsoringOwnerCount) = 1; }, + .expectedFailure = "pseudo-account has a sponsorship field", + .func = [](SLE::pointer& sle) { sle->at(sfSponsoringOwnerCount) = 1; }, }, { - .expectedFailure="pseudo-account has a sponsorship field", - .func=[](SLE::pointer& sle) { sle->at(sfSponsoringAccountCount) = 1; }, + .expectedFailure = "pseudo-account has a sponsorship field", + .func = [](SLE::pointer& sle) { sle->at(sfSponsoringAccountCount) = 1; }, }, { - .expectedFailure="pseudo-account has a sponsorship field", - .func=[](SLE::pointer& sle) { sle->at(sfSponsor) = Account("sponsor").id(); }, + .expectedFailure = "pseudo-account has a sponsorship field", + .func = [](SLE::pointer& sle) { sle->at(sfSponsor) = Account("sponsor").id(); }, }, }); diff --git a/src/test/app/Oracle_test.cpp b/src/test/app/Oracle_test.cpp index 5dab84a6b9..71875b429e 100644 --- a/src/test/app/Oracle_test.cpp +++ b/src/test/app/Oracle_test.cpp @@ -21,12 +21,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include diff --git a/src/test/app/Sponsor_test.cpp b/src/test/app/Sponsor_test.cpp index 6d7ac1a9cf..4990cbf679 100644 --- a/src/test/app/Sponsor_test.cpp +++ b/src/test/app/Sponsor_test.cpp @@ -1,47 +1,49 @@ -#include -#include -#include -#include -#include -#include -#include - -#include -#include #include #include +#include #include #include #include #include #include +#include #include #include #include +#include #include #include #include #include #include +#include #include #include #include #include +#include #include #include +#include #include #include #include #include +#include + +#include + #include #include #include +#include #include #include #include #include #include #include +#include #include #include #include @@ -52,7 +54,7 @@ #include #include #include -#include + #include #include #include @@ -63,7 +65,6 @@ #include #include - namespace xrpl::test { static STAmount @@ -88,14 +89,17 @@ adjustAccountXRPBalance(jtx::Env& env, jtx::Account const& account, STAmount con return; auto const baseFee = env.current()->fees().base; - if (currentBalance > balanceTo) { + if (currentBalance > balanceTo) + { env(pay(account, env.master, currentBalance - (balanceTo)), fee(XRP(1)), sponsor::as(env.master, spfSponsorFee), sig(sfSponsorSignature, env.master)); - } else { + } + else + { env(pay(env.master, account, balanceTo - currentBalance), fee(baseFee)); -} + } env.close(); } @@ -2020,11 +2024,14 @@ public: auto submit = [&](TER _ter) { return [&, _ter](Json::Value const& jv, auto const&... fN) { - if (sponsorSig) { + if (sponsorSig) + { env(jv, fN..., sponsor::as(sponsor, spfSponsorReserve), *sponsorSig, ter(_ter)); - } else { + } + else + { env(jv, fN..., sponsor::as(sponsor, spfSponsorReserve), ter(_ter)); -} + } }; }; @@ -2046,14 +2053,17 @@ public: env.close(); } - if (sponsorReserveCount - 1 > 0) { + if (sponsorReserveCount - 1 > 0) + { env(sponsor::set(sponsor, 0, sponsorReserveCount - 1, XRP(1)), sponsor::sponseeAcc(sponsee)); - } else { + } + else + { // just create sponsor object env(sponsor::set(sponsor, 0, std::nullopt, XRP(1)), sponsor::sponseeAcc(sponsee)); -} + } env.close(); } callback(env, submit(insufficientReserveResult)); @@ -2086,9 +2096,11 @@ public: } } - if (expected) { + if (expected) + { (*expected)(); - } else + } + else { BEAST_EXPECT(ownerCount(env, sponsee) - sponseeOwnerCountBefore == reserveCount); BEAST_EXPECT( @@ -5920,5 +5932,4 @@ BEAST_DEFINE_TESTSUITE(Sponsor, app, xrpl); BEAST_DEFINE_TESTSUITE(SponsorTxCosigning, app, xrpl); BEAST_DEFINE_TESTSUITE(SponsorTxPrefunded, app, xrpl); -} // namespace xrpl::test - +} // namespace xrpl::test diff --git a/src/test/jtx/impl/sponsor.cpp b/src/test/jtx/impl/sponsor.cpp index 57a9cc32e6..c10f36e233 100644 --- a/src/test/jtx/impl/sponsor.cpp +++ b/src/test/jtx/impl/sponsor.cpp @@ -1,23 +1,20 @@ #include - -#include -#include #include #include #include + #include #include #include #include #include +#include +#include + #include #include - - - - namespace xrpl::test::jtx::sponsor { Json::Value @@ -130,7 +127,4 @@ ledgerEntry(jtx::Env& env, jtx::Account const& sponsor, jtx::Account const& spon return env.rpc("json", "ledger_entry", to_string(jvParams)); } -} // namespace xrpl::test::jtx::sponsor - - - +} // namespace xrpl::test::jtx::sponsor diff --git a/src/test/jtx/owners.h b/src/test/jtx/owners.h index 56512c30b1..0ebc17fd91 100644 --- a/src/test/jtx/owners.h +++ b/src/test/jtx/owners.h @@ -71,7 +71,8 @@ private: std::uint32_t value_; public: - sponsored_owners(Account account, std::uint32_t value) : account_(std::move(account)), value_(value) + sponsored_owners(Account account, std::uint32_t value) + : account_(std::move(account)), value_(value) { } @@ -87,7 +88,7 @@ private: std::uint32_t value_; public: - sponsoring_owners(Account account, std::uint32_t value) + sponsoring_owners(Account account, std::uint32_t value) : account_(std::move(account)), value_(value) { } @@ -104,7 +105,7 @@ private: std::uint32_t value_; public: - sponsoring_account_count(Account account, std::uint32_t value) + sponsoring_account_count(Account account, std::uint32_t value) : account_(std::move(account)), value_(value) { } diff --git a/src/test/jtx/sponsor.h b/src/test/jtx/sponsor.h index 9dc99e4e19..de1a712fc8 100644 --- a/src/test/jtx/sponsor.h +++ b/src/test/jtx/sponsor.h @@ -6,10 +6,6 @@ #include - - - - namespace xrpl::test::jtx::sponsor { Json::Value @@ -47,7 +43,7 @@ private: jtx::Account sponsor_; public: - counterpartySponsor(jtx::Account account) : sponsor_(std::move(account)) + counterpartySponsor(jtx::Account account) : sponsor_(std::move(account)) { } @@ -61,7 +57,7 @@ private: jtx::Account sponsee_; public: - sponseeAcc(jtx::Account account) : sponsee_(std::move(account)) + sponseeAcc(jtx::Account account) : sponsee_(std::move(account)) { } @@ -76,7 +72,7 @@ private: std::uint32_t flags; public: - as(jtx::Account account, std::uint32_t flags = 0) : sponsor_(std::move(account)), flags(flags) + as(jtx::Account account, std::uint32_t flags = 0) : sponsor_(std::move(account)), flags(flags) { } @@ -87,7 +83,4 @@ public: Json::Value ledgerEntry(jtx::Env& env, jtx::Account const& sponsor, jtx::Account const& sponsee); -} // namespace xrpl::test::jtx::sponsor - - - +} // namespace xrpl::test::jtx::sponsor diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp index d68dcd3f4a..a85a536d38 100644 --- a/src/test/rpc/AccountObjects_test.cpp +++ b/src/test/rpc/AccountObjects_test.cpp @@ -26,12 +26,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include