Update names, etc. to match develop

This commit is contained in:
Ed Hennis
2026-06-17 18:32:16 -04:00
parent f2a22d4b99
commit dd95b326b3
4 changed files with 26 additions and 24 deletions

View File

@@ -873,7 +873,7 @@ public:
// Valid XRP — no issuer field
{
Json::Value jv;
json::Value jv;
jv[jss::currency] = "XRP";
auto const issue = issueFromJson(jv);
BEAST_EXPECT(isXRP(issue));
@@ -881,7 +881,7 @@ public:
// Valid IOU — legitimate issuer
{
Json::Value jv;
json::Value jv;
jv[jss::currency] = "USD";
jv[jss::issuer] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
auto const issue = issueFromJson(jv);
@@ -893,7 +893,7 @@ public:
// rejected
try
{
Json::Value jv;
json::Value jv;
jv[jss::currency] = "USD";
jv[jss::issuer] = to_string(noAccount());
issueFromJson(jv);
@@ -908,7 +908,7 @@ public:
// as IOU issuer
try
{
Json::Value jv;
json::Value jv;
jv[jss::currency] = "USD";
jv[jss::issuer] = to_string(xrpAccount());
issueFromJson(jv);
@@ -922,7 +922,7 @@ public:
// Invalid base58 — must be rejected
try
{
Json::Value jv;
json::Value jv;
jv[jss::currency] = "USD";
jv[jss::issuer] = "not_a_valid_address";
issueFromJson(jv);
@@ -936,7 +936,7 @@ public:
// Non-XRP currency with no issuer field — must be rejected
try
{
Json::Value jv;
json::Value jv;
jv[jss::currency] = "USD";
issueFromJson(jv);
fail("missing issuer accepted");
@@ -949,7 +949,7 @@ public:
// XRP with an issuer field — must be rejected
try
{
Json::Value jv;
json::Value jv;
jv[jss::currency] = "XRP";
jv[jss::issuer] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
issueFromJson(jv);

View File

@@ -1,5 +1,6 @@
#include <test/jtx/Account.h>
#include <test/jtx/Env.h>
#include <test/jtx/amount.h> // IWYU pragma: keep
#include <xrpl/basics/base_uint.h>
@@ -152,14 +153,14 @@ public:
env.fund(XRP(10000), alice);
env.close();
Json::Value txJson;
json::Value txJson;
txJson[jss::TransactionType] = "AMMDelete";
txJson[jss::Account] = alice.human();
txJson[jss::Asset][jss::currency] = "USD";
txJson[jss::Asset][jss::issuer] = to_string(noAccount());
txJson[jss::Asset2][jss::currency] = "XRP";
Json::Value req;
json::Value req;
req[jss::tx_json] = txJson;
req[jss::secret] = alice.name();
@@ -175,7 +176,7 @@ public:
testcase("noAccount issuer rejection");
{
Json::Value jv;
json::Value jv;
jv[jss::currency] = "USD";
jv[jss::issuer] = to_string(noAccount());
@@ -192,7 +193,7 @@ public:
{
Serializer s;
s.addBitString(to_currency("USD"));
s.addBitString(toCurrency("USD"));
s.addBitString(noAccount());
SerialIter iter(s.slice());
@@ -225,14 +226,14 @@ public:
env.fund(XRP(10000), alice);
env.close();
Json::Value txJson;
json::Value txJson;
txJson[jss::TransactionType] = "AMMDelete";
txJson[jss::Account] = alice.human();
txJson[jss::Asset][jss::currency] = "USD";
txJson[jss::Asset][jss::issuer] = to_string(xrpAccount());
txJson[jss::Asset2][jss::currency] = "XRP";
Json::Value req;
json::Value req;
req[jss::tx_json] = txJson;
req[jss::secret] = alice.name();
@@ -248,7 +249,7 @@ public:
testcase("xrpAccount issuer rejection");
{
Json::Value jv;
json::Value jv;
jv[jss::currency] = "USD";
jv[jss::issuer] = to_string(xrpAccount());

View File

@@ -1366,7 +1366,7 @@ public:
env.close();
auto const rpcAccountObjects = [&](std::optional<uint32_t> limit = std::nullopt) {
Json::Value params;
json::Value params;
params[jss::account] = alice.human();
if (limit.has_value())
{
@@ -1380,7 +1380,7 @@ public:
seqs.reserve(numEntries);
for ([[maybe_unused]] auto _ : std::ranges::iota_view{0, numEntries})
{
Json::Value params;
json::Value params;
params[jss::secret] = toBase58(generateSeed("alice"));
params[jss::tx_json] = offer(alice, EUR(1), XRP(2));
auto const res = env.rpc("json", "submit", to_string(params))[jss::result];
@@ -1395,9 +1395,9 @@ public:
for (auto const s : std::views::all(seqs) | std::views::take(numEntries - 1))
{
Json::Value params;
json::Value params;
params[jss::secret] = toBase58(generateSeed("alice"));
params[jss::tx_json] = offer_cancel(alice, s - 1);
params[jss::tx_json] = offerCancel(alice, s - 1);
auto const res = env.rpc("json", "submit", to_string(params))[jss::result];
BEAST_EXPECT(res[jss::status].asString() == "success");
}
@@ -1408,9 +1408,9 @@ public:
BEAST_EXPECT(not res[jss::result].isMember(jss::marker));
{
Json::Value params;
json::Value params;
params[jss::secret] = toBase58(generateSeed("alice"));
Json::Value tx_json;
json::Value tx_json;
tx_json[jss::TransactionType] = jss::NFTokenMint;
tx_json[jss::Account] = to_string(alice.id());
tx_json["NFTokenTaxon"] = 1;

View File

@@ -2,6 +2,7 @@
#include <test/jtx/Env.h>
#include <test/jtx/amount.h>
#include <test/jtx/envconfig.h>
#include <test/jtx/multisign.h>
#include <test/jtx/noop.h>
#include <test/jtx/pay.h>
#include <test/jtx/seq.h>
@@ -892,7 +893,7 @@ class Transaction_test : public beast::unit_test::Suite
auto makeConfig = [](std::uint32_t networkID) {
return envconfig([networkID](std::unique_ptr<Config> cfg) {
cfg->NETWORK_ID = networkID;
cfg->networkId = networkID;
return cfg;
});
};
@@ -905,7 +906,7 @@ class Transaction_test : public beast::unit_test::Suite
};
auto makeTx = [&](Env& env) {
Json::Value tx;
json::Value tx;
tx[jss::TransactionType] = jss::AccountSet;
tx[jss::Account] = owner.human();
tx[jss::Sequence] = env.seq(owner);
@@ -914,8 +915,8 @@ class Transaction_test : public beast::unit_test::Suite
return tx;
};
auto signFor = [&](Env& env, Json::Value const& tx) {
Json::Value signReq;
auto signFor = [&](Env& env, json::Value const& tx) {
json::Value signReq;
signReq[jss::tx_json] = tx;
signReq[jss::account] = signer.human();
signReq[jss::secret] = signer.name();