ledger_entry RPC by index matches other forms [RIPD-1538]

This commit is contained in:
Scott Schurr
2018-10-09 18:27:09 -07:00
committed by Mike Ellery
parent 8fc6a8175b
commit 63e167b7a3
2 changed files with 10 additions and 9 deletions

View File

@@ -50,7 +50,6 @@ Json::Value doLedgerEntry (RPC::Context& context)
if (context.params.isMember (jss::index)) if (context.params.isMember (jss::index))
{ {
uNodeIndex.SetHex (context.params[jss::index].asString()); uNodeIndex.SetHex (context.params[jss::index].asString());
bNodeBinary = true;
} }
else if (context.params.isMember (jss::account_root)) else if (context.params.isMember (jss::account_root))
{ {

View File

@@ -248,12 +248,6 @@ class LedgerRPC_test : public beast::unit_test::suite
BEAST_EXPECT(jrr[jss::ledger_index] == 3); BEAST_EXPECT(jrr[jss::ledger_index] == 3);
} }
char const alicesAcctRootBinary[] {
"1100612200800000240000000225000000032D00000000554294BEBE5B569"
"A18C0A2702387C9B1E7146DC3A5850C1E87204951C6FDAA4C426240000002"
"540BE4008114AE123A8556F3CF91154711376AFB0F894F832B3D"
};
std::string accountRootIndex; std::string accountRootIndex;
{ {
// Request alice's account root. // Request alice's account root.
@@ -268,6 +262,12 @@ class LedgerRPC_test : public beast::unit_test::suite
accountRootIndex = jrr[jss::index].asString(); accountRootIndex = jrr[jss::index].asString();
} }
{ {
constexpr char alicesAcctRootBinary[] {
"1100612200800000240000000225000000032D00000000554294BEBE5B569"
"A18C0A2702387C9B1E7146DC3A5850C1E87204951C6FDAA4C426240000002"
"540BE4008114AE123A8556F3CF91154711376AFB0F894F832B3D"
};
// Request alice's account root, but with binary == true; // Request alice's account root, but with binary == true;
Json::Value jvParams; Json::Value jvParams;
jvParams[jss::account_root] = alice.human(); jvParams[jss::account_root] = alice.human();
@@ -284,8 +284,10 @@ class LedgerRPC_test : public beast::unit_test::suite
jvParams[jss::index] = accountRootIndex; jvParams[jss::index] = accountRootIndex;
Json::Value const jrr = env.rpc ( Json::Value const jrr = env.rpc (
"json", "ledger_entry", to_string (jvParams))[jss::result]; "json", "ledger_entry", to_string (jvParams))[jss::result];
BEAST_EXPECT(jrr.isMember(jss::node_binary)); BEAST_EXPECT(! jrr.isMember(jss::node_binary));
BEAST_EXPECT(jrr[jss::node_binary] == alicesAcctRootBinary); BEAST_EXPECT(jrr.isMember(jss::node));
BEAST_EXPECT(jrr[jss::node][jss::Account] == alice.human());
BEAST_EXPECT(jrr[jss::node][sfBalance.jsonName] == "10000000000");
} }
{ {
// Request alice's account root by index, but with binary == false. // Request alice's account root by index, but with binary == false.