ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-04 01:06:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
Oleksandr
2026-05-14 01:24:56 -04:00
parent 39e819927f
commit 0bfdfa73ff
12 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/xrpl/tx/transactors/sponsor/SponsorshipSet.h
View File

@@ -7,7 +7,7 @@ namespace xrpl {
class SponsorshipSet : public Transactor
{
public:
static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{Normal};
static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
explicit SponsorshipSet(ApplyContext& ctx) : Transactor(ctx)
{

2
include/xrpl/tx/transactors/sponsor/SponsorshipTransfer.h
View File

@@ -7,7 +7,7 @@ namespace xrpl {
class SponsorshipTransfer : public Transactor
{
public:
static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{Normal};
static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
explicit SponsorshipTransfer(ApplyContext& ctx) : Transactor(ctx)
{

1
src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
View File

@@ -31,6 +31,7 @@
#include <cstdint>
#include <memory>
#include <optional>
#include <utility>
namespace xrpl {

1
src/libxrpl/tx/Transactor.cpp
View File

@@ -18,6 +18,7 @@
#include <xrpl/ledger/helpers/NFTokenHelpers.h>
#include <xrpl/ledger/helpers/OfferHelpers.h>
#include <xrpl/ledger/helpers/RippleStateHelpers.h>
#include <xrpl/ledger/helpers/SponsorHelpers.h>
#include <xrpl/protocol/AccountID.h>
#include <xrpl/protocol/Feature.h>
#include <xrpl/protocol/IOUAmount.h>

1
src/libxrpl/tx/invariants/SponsorshipInvariant.cpp
View File

@@ -13,6 +13,7 @@
#include <xrpl/tx/transactors/oracle/OracleSet.h>
#include <cstdint>
#include <memory>
namespace xrpl {

1
src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp
View File

@@ -14,6 +14,7 @@
#include <xrpl/ledger/helpers/EscrowHelpers.h>
#include <xrpl/ledger/helpers/MPTokenHelpers.h>
#include <xrpl/ledger/helpers/RippleStateHelpers.h>
#include <xrpl/ledger/helpers/SponsorHelpers.h>
#include <xrpl/ledger/helpers/TokenHelpers.h>
#include <xrpl/protocol/AccountID.h>
#include <xrpl/protocol/Concepts.h>

1
src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp
View File

@@ -23,6 +23,7 @@
#include <cstdint>
#include <memory>
#include <utility>
namespace xrpl {

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

@@ -2099,7 +2099,7 @@ class MPToken_test : public beast::unit_test::Suite
jv[jss::TransactionType] = jss::SponsorshipSet;
jv[jss::Account] = alice.human();
jv[sfSponsee.fieldName] = carol.human();
jv[sfFeeAmount.fieldName] = mpt.getJson(JsonOptions::KNone);
jv[sfFeeAmount.fieldName] = mpt.getJson(JsonOptions::Values::None);
test(jv, sfFeeAmount.fieldName.c_str());
}
}

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

@@ -2178,8 +2178,8 @@ public:
json::Value jv;
jv[jss::TransactionType] = jss::AMMCreate;
jv[jss::Account] = account.human();
jv[jss::Amount] = amount1.getJson(JsonOptions::KNone);
jv[jss::Amount2] = amount2.getJson(JsonOptions::KNone);
jv[jss::Amount] = amount1.getJson(JsonOptions::Values::None);
jv[jss::Amount2] = amount2.getJson(JsonOptions::Values::None);
jv[jss::TradingFee] = 0;
jv[jss::Fee] = std::to_string(env.current()->fees().increment.drops());
return jv;
@@ -2192,10 +2192,10 @@ public:
json::Value jv;
jv[jss::TransactionType] = jss::AMMDeposit;
jv[jss::Account] = account.human();
jv[jss::Asset] = STIssue(sfAsset, amount1.asset()).getJson(JsonOptions::KNone);
jv[jss::Asset2] = STIssue(sfAsset, amount2.asset()).getJson(JsonOptions::KNone);
jv[jss::Amount] = amount1.value().getJson(JsonOptions::KNone);
jv[jss::Amount2] = amount2.value().getJson(JsonOptions::KNone);
jv[jss::Asset] = STIssue(sfAsset, amount1.asset()).getJson(JsonOptions::Values::None);
jv[jss::Asset2] = STIssue(sfAsset, amount2.asset()).getJson(JsonOptions::Values::None);
jv[jss::Amount] = amount1.value().getJson(JsonOptions::Values::None);
jv[jss::Amount2] = amount2.value().getJson(JsonOptions::Values::None);
jv[jss::Flags] = tfTwoAsset;
return jv;
};
@@ -2368,9 +2368,9 @@ public:
json::Value jv;
jv[jss::TransactionType] = jss::AMMWithdraw;
jv[jss::Account] = alice.human();
jv[jss::Asset] = STIssue(sfAsset, usd.issue()).getJson(JsonOptions::KNone);
jv[jss::Asset2] = STIssue(sfAsset, eur.issue()).getJson(JsonOptions::KNone);
jv[jss::Amount] = usd(100).value().getJson(JsonOptions::KNone);
jv[jss::Asset] = STIssue(sfAsset, usd.issue()).getJson(JsonOptions::Values::None);
jv[jss::Asset2] = STIssue(sfAsset, eur.issue()).getJson(JsonOptions::Values::None);
jv[jss::Amount] = usd(100).value().getJson(JsonOptions::Values::None);
jv[jss::Flags] = tfSingleAsset;
env(ticket::create(sponsor, 1)); // adjust for free
@@ -2418,8 +2418,8 @@ public:
json::Value jv;
jv[jss::TransactionType] = jss::AMMWithdraw;
jv[jss::Account] = alice.human();
jv[jss::Asset] = STIssue(sfAsset, usd.issue()).getJson(JsonOptions::KNone);
jv[jss::Asset2] = STIssue(sfAsset, eur.issue()).getJson(JsonOptions::KNone);
jv[jss::Asset] = STIssue(sfAsset, usd.issue()).getJson(JsonOptions::Values::None);
jv[jss::Asset2] = STIssue(sfAsset, eur.issue()).getJson(JsonOptions::Values::None);
jv[jss::Flags] = tfWithdrawAll;
env(ticket::create(sponsor, 1)); // adjust for free trustline
@@ -4217,7 +4217,7 @@ public:
duration_cast<seconds>(env.current()->header().closeTime.time_since_epoch())
.count() +
kEPOCH_OFFSET.count() + 100);
jv[jss::PriceDataSeries] = json::ArrayValue;
jv[jss::PriceDataSeries] = json::ValueType::Array;
jv[jss::Provider] = strHex(std::string{"provider"});
jv[jss::AssetClass] = strHex(std::string{"currency"});
@@ -4236,7 +4236,7 @@ public:
DataSeries const actualSeries(series.begin(), series.begin() + dataSeriesSize);
json::Value dataSeries(json::ArrayValue);
json::Value dataSeries(json::ValueType::Array);
for (auto const& data : actualSeries)
{
json::Value priceData;

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

@@ -6,11 +6,11 @@
#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 <xrpl/json/to_string.h>
#include <cstdint>
#include <optional>
@@ -31,9 +31,9 @@ set(jtx::Account const& account,
if (reserveCount)
jv[sfReserveCount.jsonName] = *reserveCount;
if (feeAmount)
jv[sfFeeAmount.jsonName] = feeAmount->getJson(JsonOptions::KNone);
jv[sfFeeAmount.jsonName] = feeAmount->getJson(JsonOptions::Values::None);
if (maxFee)
jv[sfMaxFee.jsonName] = maxFee->getJson(JsonOptions::KNone);
jv[sfMaxFee.jsonName] = maxFee->getJson(JsonOptions::Values::None);
return jv;
}
@@ -48,9 +48,9 @@ set_fee(
jv[jss::TransactionType] = jss::SponsorshipSet;
jv[jss::Account] = account.human();
jv[sfFlags.jsonName] = flags;
jv[sfFeeAmount.jsonName] = feeAmount.getJson(JsonOptions::KNone);
jv[sfFeeAmount.jsonName] = feeAmount.getJson(JsonOptions::Values::None);
if (maxFee)
jv[sfMaxFee.jsonName] = maxFee->getJson(JsonOptions::KNone);
jv[sfMaxFee.jsonName] = maxFee->getJson(JsonOptions::Values::None);
return jv;
}
@@ -72,7 +72,7 @@ set_max_fee(jtx::Account const& account, uint32_t flags, STAmount maxFee)
jv[jss::TransactionType] = jss::SponsorshipSet;
jv[jss::Account] = account.human();
jv[sfFlags.jsonName] = flags;
jv[sfMaxFee.jsonName] = maxFee.getJson(JsonOptions::KNone);
jv[sfMaxFee.jsonName] = maxFee.getJson(JsonOptions::Values::None);
return jv;
}

3
src/test/rpc/AccountTx_test.cpp
View File

@@ -916,7 +916,8 @@ class AccountTx_test : public beast::unit_test::Suite
auto const& tx0(jv[jss::transactions][0u][jss::tx]);
BEAST_EXPECT(tx0[jss::TransactionType] == txType);
std::string const txHash{env.tx()->getJson(JsonOptions::Values::None)[jss::hash].asString()};
std::string const txHash{
env.tx()->getJson(JsonOptions::Values::None)[jss::hash].asString()};
BEAST_EXPECT(tx0[jss::hash] == txHash);
};

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

@@ -603,7 +603,7 @@ class Simulate_test : public beast::unit_test::Suite
tx[sfDomain.jsonName] = kNEW_DOMAIN;
tx[sfSponsor.jsonName] = sponsor.human();
tx[sfSponsorFlags.jsonName] = spfSponsorFee;
tx[sfSponsorSignature.jsonName] = json::ObjectValue;
tx[sfSponsorSignature.jsonName] = json::ValueType::Object;
// test with autofill
testTx(env, tx, validateOutput);