diff --git a/include/xrpl/tx/transactors/sponsor/SponsorshipSet.h b/include/xrpl/tx/transactors/sponsor/SponsorshipSet.h index 5ca90f7963..b0579428b6 100644 --- a/include/xrpl/tx/transactors/sponsor/SponsorshipSet.h +++ b/include/xrpl/tx/transactors/sponsor/SponsorshipSet.h @@ -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) { diff --git a/include/xrpl/tx/transactors/sponsor/SponsorshipTransfer.h b/include/xrpl/tx/transactors/sponsor/SponsorshipTransfer.h index 78888f022d..93a0cd6883 100644 --- a/include/xrpl/tx/transactors/sponsor/SponsorshipTransfer.h +++ b/include/xrpl/tx/transactors/sponsor/SponsorshipTransfer.h @@ -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) { diff --git a/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp b/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp index d39c8134cd..fe23456c79 100644 --- a/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp +++ b/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp @@ -31,6 +31,7 @@ #include #include #include +#include namespace xrpl { diff --git a/src/libxrpl/tx/Transactor.cpp b/src/libxrpl/tx/Transactor.cpp index ef8b7541a9..f17cb2fa5e 100644 --- a/src/libxrpl/tx/Transactor.cpp +++ b/src/libxrpl/tx/Transactor.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include diff --git a/src/libxrpl/tx/invariants/SponsorshipInvariant.cpp b/src/libxrpl/tx/invariants/SponsorshipInvariant.cpp index 1dee7f2dac..41d55e9019 100644 --- a/src/libxrpl/tx/invariants/SponsorshipInvariant.cpp +++ b/src/libxrpl/tx/invariants/SponsorshipInvariant.cpp @@ -13,6 +13,7 @@ #include #include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp b/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp index b3cc24ccb0..c23731ec35 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 diff --git a/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp index 065905f65d..17e7b7ff6d 100644 --- a/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp +++ b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp @@ -23,6 +23,7 @@ #include #include +#include namespace xrpl { diff --git a/src/test/app/MPToken_test.cpp b/src/test/app/MPToken_test.cpp index 0f26a4d2b0..2cee6637a5 100644 --- a/src/test/app/MPToken_test.cpp +++ b/src/test/app/MPToken_test.cpp @@ -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()); } } diff --git a/src/test/app/Sponsor_test.cpp b/src/test/app/Sponsor_test.cpp index ef808948bd..272cafca8b 100644 --- a/src/test/app/Sponsor_test.cpp +++ b/src/test/app/Sponsor_test.cpp @@ -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(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; diff --git a/src/test/jtx/impl/sponsor.cpp b/src/test/jtx/impl/sponsor.cpp index 0901a0aec3..5593e1b78c 100644 --- a/src/test/jtx/impl/sponsor.cpp +++ b/src/test/jtx/impl/sponsor.cpp @@ -6,11 +6,11 @@ #include #include +#include #include #include #include #include -#include #include #include @@ -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; } diff --git a/src/test/rpc/AccountTx_test.cpp b/src/test/rpc/AccountTx_test.cpp index f118a3a832..e2660b30c0 100644 --- a/src/test/rpc/AccountTx_test.cpp +++ b/src/test/rpc/AccountTx_test.cpp @@ -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); }; diff --git a/src/test/rpc/Simulate_test.cpp b/src/test/rpc/Simulate_test.cpp index 96dbe85596..2306b54352 100644 --- a/src/test/rpc/Simulate_test.cpp +++ b/src/test/rpc/Simulate_test.cpp @@ -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);