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

refactor: Use more scoped enums (#7086)

Browse Source
This commit is contained in:
Alex Kremer
2026-05-11 16:39:48 +01:00
committed by GitHub
parent 779b49cd93
commit cdee9a675c
379 changed files with 2771 additions and 2864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,7 +216,8 @@ class MPToken_test : public beast::unit_test::Suite
tfMPTCanTransfer | tfMPTCanClawback});
// Get the hash for the most recent transaction.
std::string const txHash{env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString()};
std::string const txHash{
env.tx()->getJson(JsonOptions::Values::None)[jss::hash].asString()};
json::Value const result = env.rpc("tx", txHash)[jss::result];
BEAST_EXPECT(result[sfMaximumAmount.getJsonName()] == "9223372036854775807");
@@ -236,7 +237,7 @@ class MPToken_test : public beast::unit_test::Suite
env(pdomain::setTx(credIssuer1, credentials1));
auto const domainId1 = [&]() {
auto tx = env.tx()->getJson(JsonOptions::KNone);
auto tx = env.tx()->getJson(JsonOptions::Values::None);
return pdomain::getNewDomain(env.meta());
}();
@@ -254,7 +255,7 @@ class MPToken_test : public beast::unit_test::Suite
// Get the hash for the most recent transaction.
std::string const txHash{
env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString()};
env.tx()->getJson(JsonOptions::Values::None)[jss::hash].asString()};
json::Value const result = env.rpc("tx", txHash)[jss::result];
BEAST_EXPECT(result[sfMaximumAmount.getJsonName()] == "9223372036854775807");
@@ -818,7 +819,7 @@ class MPToken_test : public beast::unit_test::Suite
env(pdomain::setTx(credIssuer1, credentials1));
return [&]() {
auto tx = env.tx()->getJson(JsonOptions::KNone);
auto tx = env.tx()->getJson(JsonOptions::Values::None);
return pdomain::getNewDomain(env.meta());
}();
}();
@@ -832,7 +833,7 @@ class MPToken_test : public beast::unit_test::Suite
env(pdomain::setTx(credIssuer2, credentials2));
return [&]() {
auto tx = env.tx()->getJson(JsonOptions::KNone);
auto tx = env.tx()->getJson(JsonOptions::Values::None);
return pdomain::getNewDomain(env.meta());
}();
}();
@@ -1095,7 +1096,7 @@ class MPToken_test : public beast::unit_test::Suite
env(pdomain::setTx(credIssuer1, credentials1));
return [&]() {
auto tx = env.tx()->getJson(JsonOptions::KNone);
auto tx = env.tx()->getJson(JsonOptions::Values::None);
return pdomain::getNewDomain(env.meta());
}();
}();
@@ -1137,7 +1138,7 @@ class MPToken_test : public beast::unit_test::Suite
env(pdomain::setTx(credIssuer1, credentials1));
return [&]() {
auto tx = env.tx()->getJson(JsonOptions::KNone);
auto tx = env.tx()->getJson(JsonOptions::Values::None);
return pdomain::getNewDomain(env.meta());
}();
}();
@@ -1194,7 +1195,7 @@ class MPToken_test : public beast::unit_test::Suite
env(pdomain::setTx(credIssuer1, credentials));
return [&]() {
auto tx = env.tx()->getJson(JsonOptions::KNone);
auto tx = env.tx()->getJson(JsonOptions::Values::None);
return pdomain::getNewDomain(env.meta());
}();
}();
@@ -1206,7 +1207,7 @@ class MPToken_test : public beast::unit_test::Suite
env(pdomain::setTx(credIssuer2, credentials));
return [&]() {
auto tx = env.tx()->getJson(JsonOptions::KNone);
auto tx = env.tx()->getJson(JsonOptions::Values::None);
return pdomain::getNewDomain(env.meta());
}();
}();
@@ -1561,7 +1562,8 @@ class MPToken_test : public beast::unit_test::Suite
// payment between the holders
env(pay(bob, carol, mpt(10'000)), Sendmax(mpt(10'000)), Txflags(tfPartialPayment));
// Verify the metadata
auto const meta = env.meta()->getJson(JsonOptions::KNone)[sfAffectedNodes.fieldName];
auto const meta =
env.meta()->getJson(JsonOptions::Values::None)[sfAffectedNodes.fieldName];
// Issuer got 10 in the transfer fees
BEAST_EXPECT(
meta[0u][sfModifiedNode.fieldName][sfFinalFields.fieldName]
@@ -1911,7 +1913,7 @@ class MPToken_test : public beast::unit_test::Suite
jv[jss::Asset] = toJson(xrpIssue());
jv[jss::Asset2] = toJson(usd.issue());
if (withAmount)
jv[field.fieldName] = usd(10).value().getJson(JsonOptions::KNone);
jv[field.fieldName] = usd(10).value().getJson(JsonOptions::Values::None);
if (field == sfAsset)
{
jv[jss::Asset] = toJson(mpt.get<MPTIssue>());
@@ -1922,7 +1924,7 @@ class MPToken_test : public beast::unit_test::Suite
}
else
{
jv[field.fieldName] = mpt.getJson(JsonOptions::KNone);
jv[field.fieldName] = mpt.getJson(JsonOptions::Values::None);
}
};
// All transactions with sfAmount, which don't support MPT.
@@ -1969,7 +1971,7 @@ class MPToken_test : public beast::unit_test::Suite
jv[jss::Destination] = carol.human();
jv[jss::SettleDelay] = 1;
jv[sfPublicKey.fieldName] = strHex(alice.pk().slice());
jv[jss::Amount] = mpt.getJson(JsonOptions::KNone);
jv[jss::Amount] = mpt.getJson(JsonOptions::Values::None);
test(jv, jss::Amount.cStr());
}
// PaymentChannelFund
@@ -1978,7 +1980,7 @@ class MPToken_test : public beast::unit_test::Suite
jv[jss::TransactionType] = jss::PaymentChannelFund;
jv[jss::Account] = alice.human();
jv[sfChannel.fieldName] = to_string(uint256{1});
jv[jss::Amount] = mpt.getJson(JsonOptions::KNone);
jv[jss::Amount] = mpt.getJson(JsonOptions::Values::None);
test(jv, jss::Amount.cStr());
}
// PaymentChannelClaim
@@ -1987,7 +1989,7 @@ class MPToken_test : public beast::unit_test::Suite
jv[jss::TransactionType] = jss::PaymentChannelClaim;
jv[jss::Account] = alice.human();
jv[sfChannel.fieldName] = to_string(uint256{1});
jv[jss::Amount] = mpt.getJson(JsonOptions::KNone);
jv[jss::Amount] = mpt.getJson(JsonOptions::Values::None);
test(jv, jss::Amount.cStr());
}
// NFTokenCreateOffer
@@ -1996,7 +1998,7 @@ class MPToken_test : public beast::unit_test::Suite
jv[jss::TransactionType] = jss::NFTokenCreateOffer;
jv[jss::Account] = alice.human();
jv[sfNFTokenID.fieldName] = to_string(uint256{1});
jv[jss::Amount] = mpt.getJson(JsonOptions::KNone);
jv[jss::Amount] = mpt.getJson(JsonOptions::Values::None);
test(jv, jss::Amount.cStr());
}
// NFTokenAcceptOffer
@@ -2004,7 +2006,7 @@ class MPToken_test : public beast::unit_test::Suite
json::Value jv;
jv[jss::TransactionType] = jss::NFTokenAcceptOffer;
jv[jss::Account] = alice.human();
jv[sfNFTokenBrokerFee.fieldName] = mpt.getJson(JsonOptions::KNone);
jv[sfNFTokenBrokerFee.fieldName] = mpt.getJson(JsonOptions::Values::None);
test(jv, sfNFTokenBrokerFee.fieldName);
}
// NFTokenMint
@@ -2013,7 +2015,7 @@ class MPToken_test : public beast::unit_test::Suite
jv[jss::TransactionType] = jss::NFTokenMint;
jv[jss::Account] = alice.human();
jv[sfNFTokenTaxon.fieldName] = 1;
jv[jss::Amount] = mpt.getJson(JsonOptions::KNone);
jv[jss::Amount] = mpt.getJson(JsonOptions::Values::None);
test(jv, jss::Amount.cStr());
}
// TrustSet
@@ -2022,7 +2024,7 @@ class MPToken_test : public beast::unit_test::Suite
jv[jss::TransactionType] = jss::TrustSet;
jv[jss::Account] = alice.human();
jv[jss::Flags] = 0;
jv[field.fieldName] = mpt.getJson(JsonOptions::KNone);
jv[field.fieldName] = mpt.getJson(JsonOptions::Values::None);
test(jv, field.fieldName);
};
trustSet(sfLimitAmount);
@@ -2054,7 +2056,7 @@ class MPToken_test : public beast::unit_test::Suite
alice, jvb, alice, mpt, XRP(10), alice, false, 1, alice, Signer(alice));
for (auto const& field : {sfAmount.fieldName, sfSignatureReward.fieldName})
{
jv[field] = mpt.getJson(JsonOptions::KNone);
jv[field] = mpt.getJson(JsonOptions::Values::None);
test(jv, field);
}
}
@@ -2063,7 +2065,7 @@ class MPToken_test : public beast::unit_test::Suite
json::Value jv = sidechainXchainAccountCreate(alice, jvb, alice, mpt, XRP(10));
for (auto const& field : {sfAmount.fieldName, sfSignatureReward.fieldName})
{
jv[field] = mpt.getJson(JsonOptions::KNone);
jv[field] = mpt.getJson(JsonOptions::Values::None);
test(jv, field);
}
}
@@ -2076,9 +2078,9 @@ class MPToken_test : public beast::unit_test::Suite
jv[jss::TransactionType] = tt;
jv[jss::Account] = alice.human();
jv[sfXChainBridge.fieldName] = jvb;
jv[sfSignatureReward.fieldName] = rewardAmount.getJson(JsonOptions::KNone);
jv[sfSignatureReward.fieldName] = rewardAmount.getJson(JsonOptions::Values::None);
jv[sfMinAccountCreateAmount.fieldName] =
minAccountAmount.getJson(JsonOptions::KNone);
minAccountAmount.getJson(JsonOptions::Values::None);
test(jv, field);
};
auto reward = STAmount{sfSignatureReward, mpt};
@@ -2112,7 +2114,8 @@ class MPToken_test : public beast::unit_test::Suite
mptAlice.create();
std::string const txHash{env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString()};
std::string const txHash{
env.tx()->getJson(JsonOptions::Values::None)[jss::hash].asString()};
BEAST_EXPECTS(
txHash ==
"E11F0E0CA14219922B7881F060B9CEE67CFBC87E4049A441ED2AE348FF8FAC"