ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-27 06:25:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
JoelKatz
2012-12-06 10:56:09 -08:00
parent 1d2bb868b6 6a318f496c
commit 3841bc406a
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpp/ripple/CallRPC.cpp
View File

@@ -174,7 +174,7 @@ Json::Value RPCParser::parseGetCounts(const Json::Value& jvParams)
return jvRequest;
}
// ledger [id|ledger_current|ledger_closed] [full]
// ledger [id|index|current|closed] [full]
Json::Value RPCParser::parseLedger(const Json::Value& jvParams)
{
Json::Value jvRequest(Json::objectValue);
@@ -186,10 +186,14 @@ Json::Value RPCParser::parseLedger(const Json::Value& jvParams)
std::string strLedger = jvParams[0u].asString();
if (strLedger == "current" || strLedger == "ledger_closed" || strLedger.length() > 12)
if (strLedger == "current" || strLedger == "closed" || strLedger.length() > 12)
{
jvRequest["ledger"] = strLedger;
}
else
{
jvRequest["ledger"] = lexical_cast_s<uint32>(strLedger);
}
if (2 == jvParams.size() && jvParams[1u].asString() == "full")
{

8
src/cpp/ripple/RPCHandler.cpp
View File

@@ -1188,9 +1188,9 @@ Json::Value RPCHandler::doLedgerCurrent(Json::Value)
return jvResult;
}
// ledger [id|ledger_current|lastclosed] [full]
// ledger [id|index|current|closed] [full]
// {
// ledger: 'ledger_current' | 'ledger_closed' | <hex> | <number>, // optional
// ledger: 'current' | 'closed' | <uint256> | <number>, // optional
// full: true | false // optional, defaults to false.
// }
Json::Value RPCHandler::doLedger(Json::Value jvRequest)
@@ -1211,9 +1211,9 @@ Json::Value RPCHandler::doLedger(Json::Value jvRequest)
std::string strLedger = jvRequest["ledger"].asString();
Ledger::pointer ledger;
if (strLedger == "ledger_current")
if (strLedger == "current")
ledger = theApp->getLedgerMaster().getCurrentLedger();
else if (strLedger == "ledger_closed")
else if (strLedger == "closed")
ledger = theApp->getLedgerMaster().getClosedLedger();
else if (strLedger.size() > 12)
ledger = theApp->getLedgerMaster().getLedgerByHash(uint256(strLedger));