ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Honor markers in ledger_data requests (RIPD-1010).

Browse Source
This commit is contained in:
Tom Ritchford
2015-08-09 20:08:07 -04:00
committed by Edward Hennis
parent b6df6748df
commit d655fdca56
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/ripple/rpc/handlers/LedgerData.cpp
View File

@@ -50,11 +50,11 @@ Json::Value doLedgerData (RPC::Context& context)
if (!lpLedger)
return jvResult;
uint256 resumePoint;
boost::optional<ReadView::key_type> key = ReadView::key_type();
if (params.isMember (jss::marker))
{
Json::Value const& jMarker = params[jss::marker];
if (! (jMarker.isString () && resumePoint.SetHex (jMarker.asString ())))
if (! (jMarker.isString () && key->SetHex (jMarker.asString ())))
return RPC::expected_field_error (jss::marker, "valid");
}
@@ -76,30 +76,32 @@ Json::Value doLedgerData (RPC::Context& context)
limit = maxLimit;
jvResult[jss::ledger_hash] = to_string (lpLedger->info().hash);
jvResult[jss::ledger_index] = std::to_string(lpLedger->info().seq);
jvResult[jss::ledger_index] = lpLedger->info().seq;
Json::Value& nodes = (jvResult[jss::state] = Json::arrayValue);
Json::Value& nodes = jvResult[jss::state];
for(auto const& sle : lpLedger->sles)
while ((key = lpLedger->succ(*key)))
{
if (limit-- <= 0)
{
auto marker = sle->key();
jvResult[jss::marker] = to_string (--marker);
break;
}
auto sle = lpLedger->read(keylet::unchecked(*key));
if (limit-- <= 0)
{
// Stop processing before the current key.
auto k = sle->key();
jvResult[jss::marker] = to_string(--k);
break;
}
if (isBinary)
{
Json::Value& entry = nodes.append (Json::objectValue);
entry[jss::data] = serializeHex(*sle);
entry[jss::index] = to_string (sle->key());
}
else
{
Json::Value& entry = nodes.append (sle->getJson (0));
entry[jss::index] = to_string (sle->key());
}
if (isBinary)
{
Json::Value& entry = nodes.append (Json::objectValue);
entry[jss::data] = serializeHex(*sle);
entry[jss::index] = to_string(sle->key());
}
else
{
Json::Value& entry = nodes.append (sle->getJson (0));
entry[jss::index] = to_string(sle->key());
}
}
return jvResult;