ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-07-27 09:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

run pre-commit

Browse Source
This commit is contained in:
tequ
2026-04-28 17:20:00 +09:00
parent c12eff6646
commit b153213e83
57 changed files with 229 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/test/app/Invariants_test.cpp
View File

@@ -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(); },
},
});

2
src/test/app/Oracle_test.cpp
View File

@@ -21,12 +21,12 @@
#include <xrpl/protocol/Feature.h>
#include <xrpl/protocol/Indexes.h>
#include <xrpl/protocol/KeyType.h>
#include <xrpl/protocol/LedgerFormats.h>
#include <xrpl/protocol/Protocol.h>
#include <xrpl/protocol/SField.h>
#include <xrpl/protocol/TER.h>
#include <xrpl/protocol/TxFlags.h>
#include <xrpl/protocol/jss.h>
#include <xrpl/protocol/LedgerFormats.h>
#include <chrono>
#include <cstdint>

61
src/test/app/Sponsor_test.cpp
View File

@@ -1,47 +1,49 @@
#include <test/jtx/Env.h>
#include <test/jtx/check.h>
#include <test/jtx/did.h>
#include <test/jtx/multisign.h>
#include <test/jtx/sponsor.h>
#include <test/jtx/ticket.h>
#include <test/jtx/xchain_bridge.h>
#include <xrpl/basics/strHex.h>
#include <xrpl/protocol/Feature.h>
#include <test/jtx/AMM.h>
#include <test/jtx/Account.h>
#include <test/jtx/Env.h>
#include <test/jtx/Oracle.h>
#include <test/jtx/TestHelpers.h>
#include <test/jtx/acctdelete.h>
#include <test/jtx/amount.h>
#include <test/jtx/batch.h>
#include <test/jtx/check.h>
#include <test/jtx/credentials.h>
#include <test/jtx/delegate.h>
#include <test/jtx/deposit.h>
#include <test/jtx/did.h>
#include <test/jtx/envconfig.h>
#include <test/jtx/escrow.h>
#include <test/jtx/fee.h>
#include <test/jtx/flags.h>
#include <test/jtx/mpt.h>
#include <test/jtx/multisign.h>
#include <test/jtx/noop.h>
#include <test/jtx/offer.h>
#include <test/jtx/pay.h>
#include <test/jtx/permissioned_domains.h>
#include <test/jtx/sponsor.h>
#include <test/jtx/tags.h>
#include <test/jtx/ter.h>
#include <test/jtx/ticket.h>
#include <test/jtx/token.h>
#include <test/jtx/trust.h>
#include <test/jtx/txflags.h>
#include <test/jtx/vault.h>
#include <test/jtx/xchain_bridge.h>
#include <xrpld/core/Config.h>
#include <xrpl/basics/Number.h>
#include <xrpl/basics/base_uint.h>
#include <xrpl/basics/chrono.h>
#include <xrpl/basics/strHex.h>
#include <xrpl/beast/unit_test/suite.h>
#include <xrpl/beast/utility/instrumentation.h>
#include <xrpl/core/ServiceRegistry.h>
#include <xrpl/json/json_value.h>
#include <xrpl/protocol/AccountID.h>
#include <xrpl/protocol/Asset.h>
#include <xrpl/protocol/Feature.h>
#include <xrpl/protocol/Indexes.h>
#include <xrpl/protocol/Issue.h>
#include <xrpl/protocol/LedgerFormats.h>
@@ -52,7 +54,7 @@
#include <xrpl/protocol/TxFlags.h>
#include <xrpl/protocol/UintTypes.h>
#include <xrpl/protocol/jss.h>
#include <xrpld/core/Config.h>
#include <chrono>
#include <cstdint>
#include <functional>
@@ -63,7 +65,6 @@
#include <utility>
#include <vector>
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

16
src/test/jtx/impl/sponsor.cpp
View File

@@ -1,23 +1,20 @@
#include <test/jtx/sponsor.h>
#include <xrpl/protocol/TxFlags.h>
#include <xrpl/protocol/jss.h>
#include <test/jtx/Account.h>
#include <test/jtx/Env.h>
#include <test/jtx/JTx.h>
#include <xrpl/basics/base_uint.h>
#include <xrpl/json/json_value.h>
#include <xrpl/json/to_string.h>
#include <xrpl/protocol/SField.h>
#include <xrpl/protocol/STAmount.h>
#include <xrpl/protocol/TxFlags.h>
#include <xrpl/protocol/jss.h>
#include <cstdint>
#include <optional>
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

7
src/test/jtx/owners.h
View File

@@ -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)
{
}

15
src/test/jtx/sponsor.h
View File

@@ -6,10 +6,6 @@
#include <utility>
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

2
src/test/rpc/AccountObjects_test.cpp
View File

@@ -26,12 +26,12 @@
#include <xrpl/json/to_string.h>
#include <xrpl/protocol/AccountID.h>
#include <xrpl/protocol/Feature.h>
#include <xrpl/protocol/Indexes.h>
#include <xrpl/protocol/SField.h>
#include <xrpl/protocol/TxFlags.h>
#include <xrpl/protocol/jss.h>
#include <xrpl/protocol/nft.h>
#include <xrpl/tx/transactors/nft/NFTokenMint.h>
#include <xrpl/protocol/Indexes.h>
#include <algorithm>
#include <cstdint>