From 2d7e096d2916b2e1e737d556bdca951d71536e27 Mon Sep 17 00:00:00 2001 From: jed Date: Mon, 11 Jun 2012 15:40:40 -0700 Subject: [PATCH] start standardizing the RPC returns --- src/Ledger.cpp | 24 ++++++++++++------------ src/RPCServer.cpp | 14 +++++++------- src/SerializedLedger.cpp | 6 +++--- src/SerializedTransaction.cpp | 10 +++++----- src/SerializedTypes.cpp | 4 ++-- src/Transaction.cpp | 24 ++++++++++++------------ src/UniqueNodeList.cpp | 6 +++--- 7 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/Ledger.cpp b/src/Ledger.cpp index c425bad1d4..7565d2a1cf 100644 --- a/src/Ledger.cpp +++ b/src/Ledger.cpp @@ -364,20 +364,20 @@ void Ledger::addJson(Json::Value& ret, int options) Json::Value ledger(Json::objectValue); boost::recursive_mutex::scoped_lock sl(mLock); - ledger["ParentHash"] = mParentHash.GetHex(); + ledger["parentHash"] = mParentHash.GetHex(); if(mClosed) { - ledger["Hash"] = mHash.GetHex(); - ledger["TransactionHash"] = mTransHash.GetHex(); - ledger["AccountHash"] = mAccountHash.GetHex(); - ledger["Closed"] = true; - ledger["Accepted"] = mAccepted; - ledger["TotalCoins"] = boost::lexical_cast(mTotCoins); + ledger["hash"] = mHash.GetHex(); + ledger["transactionHash"] = mTransHash.GetHex(); + ledger["accountHash"] = mAccountHash.GetHex(); + ledger["closed"] = true; + ledger["accepted"] = mAccepted; + ledger["totalCoins"] = boost::lexical_cast(mTotCoins); } - else ledger["Closed"] = false; + else ledger["closed"] = false; if (mCloseTime != 0) - ledger["CloseTime"] = boost::posix_time::to_simple_string(ptFromSeconds(mCloseTime)); + ledger["closeTime"] = boost::posix_time::to_simple_string(ptFromSeconds(mCloseTime)); bool full = (options & LEDGER_JSON_FULL) != 0; if (full || ((options & LEDGER_JSON_DUMP_TXNS) != 0)) { @@ -393,7 +393,7 @@ void Ledger::addJson(Json::Value& ret, int options) } else txns.append(item->getTag().GetHex()); } - ledger["Transactions"] = txns; + ledger["transactions"] = txns; } if (full || ((options & LEDGER_JSON_DUMP_STATE) != 0)) { @@ -410,9 +410,9 @@ void Ledger::addJson(Json::Value& ret, int options) else state.append(item->getTag().GetHex()); } - ledger["AccountState"] = state; + ledger["accountState"] = state; } - ledger["SeqNum"]=boost::lexical_cast(mLedgerSeq); + ledger["seqNum"]=boost::lexical_cast(mLedgerSeq); ret["ledger"] = ledger; } diff --git a/src/RPCServer.cpp b/src/RPCServer.cpp index 4b70ea92c2..55c72fd07f 100644 --- a/src/RPCServer.cpp +++ b/src/RPCServer.cpp @@ -1076,7 +1076,7 @@ Json::Value RPCServer::doPasswordSet(Json::Value& params) std::vector vucGeneratorCipher = naRegular0Private.accountPrivateEncrypt(naRegular0Public, naMasterGenerator.getFamilyGenerator()); std::vector vucGeneratorSig; - // Prove that we have the corrisponding private key to the generator id. So, we can get the generator id. + // Prove that we have the corresponding private key to the generator id. So, we can get the generator id. // XXX Check result. naRegular0Private.accountPrivateSign(Serializer::getSHA512Half(vucGeneratorCipher), vucGeneratorSig); @@ -1085,7 +1085,7 @@ Json::Value RPCServer::doPasswordSet(Json::Value& params) unsigned int iIndex = -1; // Compensate for initial increment. int iMax = theConfig.ACCOUNT_PROBE_MAX; - // YYY Could probe peridoically to see if accounts exists. + // YYY Could probe periodically to see if accounts exists. // YYY Max could be set randomly. // Don't look at ledger entries to determine if the account exists. Don't want to leak to thin server that these accounts are // related. @@ -1424,7 +1424,7 @@ Json::Value RPCServer::doAccountTransactions(Json::Value& params) #endif std::vector< std::pair > txns = mNetOps->getAffectedAccounts(account, minLedger, maxLedger); Json::Value ret(Json::objectValue); - ret["Account"] = account.humanAccountID(); + ret["account"] = account.humanAccountID(); Json::Value ledgers(Json::arrayValue); uint32 currentLedger = 0; @@ -1435,23 +1435,23 @@ Json::Value RPCServer::doAccountTransactions(Json::Value& params) { if (currentLedger != 0) // add old ledger { - ledger["Transactions"] = jtxns; + ledger["transactions"] = jtxns; ledgers.append(ledger); ledger = Json::objectValue; } currentLedger = it->first; - ledger["LedgerSeq"] = currentLedger; + ledger["ledgerSeq"] = currentLedger; jtxns = Json::arrayValue; } jtxns.append(it->second.GetHex()); } if (currentLedger != 0) { - ledger["Transactions"] = jtxns; + ledger["transactions"] = jtxns; ledgers.append(ledger); } - ret["Ledgers"] = ledgers; + ret["ledgers"] = ledgers; return ret; #ifndef DEBUG } diff --git a/src/SerializedLedger.cpp b/src/SerializedLedger.cpp index 726296d189..0dac98c623 100644 --- a/src/SerializedLedger.cpp +++ b/src/SerializedLedger.cpp @@ -57,9 +57,9 @@ std::string SerializedLedgerEntry::getText() const Json::Value SerializedLedgerEntry::getJson(int options) const { Json::Value ret(mObject.getJson(options)); - ret["Type"] = mFormat->t_name; - ret["Index"] = mIndex.GetHex(); - ret["Version"] = mVersion.getText(); + ret["type"] = mFormat->t_name; + ret["index"] = mIndex.GetHex(); + ret["version"] = mVersion.getText(); return ret; } diff --git a/src/SerializedTransaction.cpp b/src/SerializedTransaction.cpp index 4d502ee534..16334e89d0 100644 --- a/src/SerializedTransaction.cpp +++ b/src/SerializedTransaction.cpp @@ -288,14 +288,14 @@ void SerializedTransaction::makeITFieldAbsent(SOE_Field field) Json::Value SerializedTransaction::getJson(int options) const { Json::Value ret = Json::objectValue; - ret["ID"] = getTransactionID().GetHex(); - ret["Signature"] = mSignature.getText(); + ret["id"] = getTransactionID().GetHex(); + ret["signature"] = mSignature.getText(); Json::Value middle = mMiddleTxn.getJson(options); - middle["Type"] = mFormat->t_name; - ret["Middle"] = middle; + middle["type"] = mFormat->t_name; + ret["middle"] = middle; - ret["Inner"] = mInnerTxn.getJson(options); + ret["inner"] = mInnerTxn.getJson(options); return ret; } diff --git a/src/SerializedTypes.cpp b/src/SerializedTypes.cpp index 1160ea429a..fabccd678b 100644 --- a/src/SerializedTypes.cpp +++ b/src/SerializedTypes.cpp @@ -344,7 +344,7 @@ Json::Value STPath::getJson(int) const Json::Value elem(Json::objectValue); NewcoinAddress account; account.setAccountID(it->getNode()); - elem["Account"] = account.humanAccountID(); + elem["account"] = account.humanAccountID(); ret.append(elem); break; } @@ -352,7 +352,7 @@ Json::Value STPath::getJson(int) const case STPathElement::typeOffer: { Json::Value elem(Json::objectValue); - elem["Offer"] = it->getNode().GetHex(); + elem["offer"] = it->getNode().GetHex(); ret.append(elem); break; } diff --git a/src/Transaction.cpp b/src/Transaction.cpp index 75ff15a111..56a95a5dbf 100644 --- a/src/Transaction.cpp +++ b/src/Transaction.cpp @@ -638,21 +638,21 @@ Json::Value Transaction::getJson(bool decorate, bool paid, bool credited) const { Json::Value ret(mTransaction->getJson(0)); - if (mInLedger) ret["InLedger"]=mInLedger; - if (paid) ret["Paid"]=true; + if (mInLedger) ret["inLedger"]=mInLedger; + if (paid) ret["paid"]=true; switch(mStatus) { - case NEW: ret["Status"] = "new"; break; - case INVALID: ret["Status"] = "invalid"; break; - case INCLUDED: ret["Status"] = "included"; break; - case CONFLICTED: ret["Status"] = "conflicted"; break; - case COMMITTED: ret["Status"] = "committed"; break; - case HELD: ret["Status"] = "held"; break; - case REMOVED: ret["Status"] = "removed"; break; - case OBSOLETE: ret["Status"] = "obsolete"; break; - case INCOMPLETE: ret["Status"] = "incomplete"; break; - default: ret["Status"] = "unknown"; + case NEW: ret["status"] = "new"; break; + case INVALID: ret["status"] = "invalid"; break; + case INCLUDED: ret["status"] = "included"; break; + case CONFLICTED: ret["status"] = "conflicted"; break; + case COMMITTED: ret["status"] = "committed"; break; + case HELD: ret["status"] = "held"; break; + case REMOVED: ret["status"] = "removed"; break; + case OBSOLETE: ret["status"] = "obsolete"; break; + case INCOMPLETE: ret["status"] = "incomplete"; break; + default: ret["status"] = "unknown"; } #if 0 diff --git a/src/UniqueNodeList.cpp b/src/UniqueNodeList.cpp index 79c09b14bf..9e6aff99fb 100644 --- a/src/UniqueNodeList.cpp +++ b/src/UniqueNodeList.cpp @@ -1234,7 +1234,7 @@ void UniqueNodeList::nodeRemove(NewcoinAddress naNodePublic) } } -// XXX Broken should opperate on seeds. +// XXX Broken should operate on seeds. void UniqueNodeList::nodeReset() { { @@ -1267,8 +1267,8 @@ Json::Value UniqueNodeList::getUnlJson() Json::Value node(Json::objectValue); - node["PublicKey"] = strPublicKey; - node["Comment"] = strComment; + node["publicKey"] = strPublicKey; + node["comment"] = strComment; ret.append(node); }