From cb280b10c12af4b901c7544d3a0a0c335083c7d1 Mon Sep 17 00:00:00 2001 From: Miguel Portilla Date: Wed, 9 Dec 2015 17:35:38 -0500 Subject: [PATCH] Improve ledger_request response --- src/ripple/protocol/JsonFields.h | 1 + src/ripple/rpc/handlers/LedgerRequest.cpp | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/ripple/protocol/JsonFields.h b/src/ripple/protocol/JsonFields.h index 9623a8356c..a28fc335f6 100644 --- a/src/ripple/protocol/JsonFields.h +++ b/src/ripple/protocol/JsonFields.h @@ -72,6 +72,7 @@ JSS ( accounts ); // in: LedgerEntry, Subscribe, // out: WalletAccounts JSS ( accounts_proposed ); // in: Subscribe, Unsubscribe JSS ( action ); +JSS ( acquiring ); // out: LedgerRequest JSS ( address ); // out: PeerImp JSS ( affected ); // out: AcceptedLedgerTx JSS ( age ); // out: UniqueNodeList, NetworkOPs, Peers diff --git a/src/ripple/rpc/handlers/LedgerRequest.cpp b/src/ripple/rpc/handlers/LedgerRequest.cpp index b580443e58..ece6a8fecb 100644 --- a/src/ripple/rpc/handlers/LedgerRequest.cpp +++ b/src/ripple/rpc/handlers/LedgerRequest.cpp @@ -89,13 +89,20 @@ Json::Value doLedgerRequest (RPC::Context& context) if (auto il = context.app.getInboundLedgers().acquire ( *refHash, refIndex, InboundLedger::fcGENERIC)) - return getJson (LedgerFill (*il)); + { + Json::Value jvResult = RPC::make_error( + rpcLGR_NOT_FOUND, + "acquiring ledger containing requested index"); + jvResult[jss::acquiring] = getJson (LedgerFill (*il)); + return jvResult; + } if (auto il = context.app.getInboundLedgers().find (*refHash)) { - Json::Value jvResult = il->getJson (0); - - jvResult[jss::error] = "ledgerNotFound"; + Json::Value jvResult = RPC::make_error( + rpcLGR_NOT_FOUND, + "acquiring ledger containing requested index"); + jvResult[jss::acquiring] = il->getJson (0); return jvResult; }