From 91b1763a09a3bef36eab95b3ce92aff8684599b7 Mon Sep 17 00:00:00 2001 From: jed Date: Fri, 29 Jun 2012 06:08:39 -0700 Subject: [PATCH] change return of account_tx --- src/RPCServer.cpp | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/src/RPCServer.cpp b/src/RPCServer.cpp index 591702c036..53e8796c15 100644 --- a/src/RPCServer.cpp +++ b/src/RPCServer.cpp @@ -1418,36 +1418,15 @@ Json::Value RPCServer::doAccountTransactions(const Json::Value& params) Json::Value ledgers(Json::arrayValue); uint32 currentLedger = 0; - Json::Value ledger, jtxns; for (std::vector< std::pair >::iterator it = txns.begin(), end = txns.end(); it != end; ++it) { - if (it->first != currentLedger) // different/new ledger - { - if (currentLedger != 0) // add old ledger - { - ledger["transactions"] = jtxns; - ledgers.append(ledger); - ledger = Json::objectValue; - } - currentLedger = it->first; - ledger["ledgerSeq"] = currentLedger; - jtxns = Json::arrayValue; - } - Transaction::pointer txn = theApp->getMasterTransaction().fetch(it->second, true); if (!txn) - jtxns.append(it->second.GetHex()); + ret["transactions"].append(it->second.GetHex()); else - jtxns.append(txn->getJson(0)); + ret["transactions"].append(txn->getJson(0)); } - if (currentLedger != 0) - { - ledger["transactions"] = jtxns; - ledgers.append(ledger); - } - - ret["ledgers"] = ledgers; return ret; #ifndef DEBUG }