Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix CTID in tx command returns invalidParams on lowercase hex #5049

Merged
merged 7 commits into from
Jul 5, 2024
Merged

fix CTID in tx command returns invalidParams on lowercase hex #5049

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
784059d
fix CTID in tx command returns invalidParams on lowercase hex
yinyiqian1 Jun 20, 2024
782fae3
test mixed case and change auto to explicit type
yinyiqian1 Jul 3, 2024
9c572f1
add header cctype because std::tolower is called
yinyiqian1 Jul 3, 2024
0ad370a
Merge branch 'develop' into br_fix_ctid_lowercase
yinyiqian1 Jul 3, 2024
eba8e44
remove unused local variable
yinyiqian1 Jul 3, 2024
0d3f8f7
change test case comment from 'lowercase' to 'mixed case'
yinyiqian1 Jul 3, 2024
7da5cdd
Merge branch 'develop' into br_fix_ctid_lowercase
zrayn Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 31 additions & 14 deletions src/test/rpc/Transaction_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,26 +674,43 @@ class Transaction_test : public beast::unit_test::suite
// test querying with lowercase ctid
yinyiqian1 marked this conversation as resolved.
Show resolved Hide resolved
{
Env env{*this, makeNetworkConfig(11111)};
uint32_t netID = env.app().config().NETWORK_ID;
std::uint32_t const netID = env.app().config().NETWORK_ID;

auto const alice = Account("alice");
auto const bob = Account("bob");
Account const alice = Account("alice");
Account const bob = Account("bob");

auto const startLegSeq = env.current()->info().seq;
std::uint32_t const startLegSeq = env.current()->info().seq;
env.fund(XRP(10000), alice, bob);
env(pay(alice, bob, XRP(10)));
env.close();

auto const ctid = *RPC::encodeCTID(startLegSeq, 0, netID);
auto lower = ctid;
transform(lower.begin(), lower.end(), lower.begin(), tolower);
Json::Value jsonTx;
jsonTx[jss::binary] = false;
jsonTx[jss::ctid] = lower;
jsonTx[jss::id] = 1;
auto jrr = env.rpc("json", "tx", to_string(jsonTx))[jss::result];
BEAST_EXPECT(jrr[jss::ctid] == ctid);
BEAST_EXPECT(jrr[jss::hash]);
std::string const ctid = *RPC::encodeCTID(startLegSeq, 0, netID);
std::string lower = ctid;
yinyiqian1 marked this conversation as resolved.
Show resolved Hide resolved

auto isUpper = [](char c) { return std::isupper(c) != 0; };
// Verify that there are at least two upper case letters in ctid and
// test a mixed case
if (BEAST_EXPECT(
std::count_if(ctid.begin(), ctid.end(), isUpper) > 1))
{
// Change the first upper case letter to lower case.
std::string mixedCase = ctid;
{
auto const iter = std::find_if(
mixedCase.begin(), mixedCase.end(), isUpper);
*iter = std::tolower(*iter);
}
BEAST_EXPECT(ctid != mixedCase);

Json::Value jsonTx;
jsonTx[jss::binary] = false;
jsonTx[jss::ctid] = mixedCase;
jsonTx[jss::id] = 1;
Json::Value const jrr =
env.rpc("json", "tx", to_string(jsonTx))[jss::result];
BEAST_EXPECT(jrr[jss::ctid] == ctid);
BEAST_EXPECT(jrr[jss::hash]);
}
}

// test that if the network is 65535 the ctid is not in the response
Expand Down