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

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

Browse Source
This commit is contained in:
Arthur Britto
2012-06-11 00:52:38 -07:00
parent 92e96bb6dc aed5776c90
commit d3e7143eff
9 changed files with 57 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/RPCServer.cpp
View File

@@ -1340,7 +1340,7 @@ Json::Value RPCServer::doTx(Json::Value& params)
Json::Value ret;
uint256 txid(param1);
Transaction::pointer txn=theApp->getMasterTransaction().fetch(txid, true);
Transaction::pointer txn = theApp->getMasterTransaction().fetch(txid, true);
if (!txn) return RPCError(rpcTXN_NOT_FOUND);
@@ -1372,7 +1372,7 @@ Json::Value RPCServer::doLedger(Json::Value& params)
Ledger::pointer ledger;
if (param == "current")
ledger = theApp->getMasterLedger().getCurrentLedger();
else if (param == "lastclosed")
else if ((param == "lastclosed") || (param == "lastaccepted"))
ledger = theApp->getMasterLedger().getClosedLedger();
else if (param.size() > 12)
ledger = theApp->getMasterLedger().getLedgerByHash(uint256(param));
@@ -1382,13 +1382,7 @@ Json::Value RPCServer::doLedger(Json::Value& params)
if (!ledger)
return RPCError(rpcLGR_NOT_FOUND);
bool full = false;
if (extractString(param, params, 1))
{
if (param == "full")
full = true;
}
bool full = extractString(param, params, 1) && (param == "full");
Json::Value ret(Json::objectValue);
ledger->addJson(ret, full ? LEDGER_JSON_FULL : 0);
return ret;