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

Use jss for many Json fields.

Browse Source 
* Document JsonFields.
  * Remove some unused JsonFields values.
This commit is contained in:
Tom Ritchford
2015-02-10 16:54:27 -05:00
parent 558c6b621b
commit 315a8b6b60
82 changed files with 1449 additions and 869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/ripple/app/paths/PathRequest.cpp
View File

@@ -163,7 +163,7 @@ bool PathRequest::isValid (RippleLineCache::ref crCache)
lrLedger, raDstAccount);
Json::Value& jvDestCur =
(jvStatus["destination_currencies"] = Json::arrayValue);
(jvStatus[jss::destination_currencies] = Json::arrayValue);
if (!asDst)
{
@@ -203,8 +203,8 @@ bool PathRequest::isValid (RippleLineCache::ref crCache)
if (bValid)
{
jvStatus["ledger_hash"] = to_string (lrLedger->getHash ());
jvStatus["ledger_index"] = lrLedger->getLedgerSeq ();
jvStatus[jss::ledger_hash] = to_string (lrLedger->getHash ());
jvStatus[jss::ledger_index] = lrLedger->getLedgerSeq ();
}
return bValid;
}
@@ -256,9 +256,9 @@ int PathRequest::parseJson (Json::Value const& jvParams, bool complete)
{
int ret = PFR_PJ_NOCHANGE;
if (jvParams.isMember ("source_account"))
if (jvParams.isMember (jss::source_account))
{
if (!raSrcAccount.setAccountID (jvParams["source_account"].asString ()))
if (!raSrcAccount.setAccountID (jvParams[jss::source_account].asString ()))
{
jvStatus = rpcError (rpcSRC_ACT_MALFORMED);
return PFR_PJ_INVALID;
@@ -270,9 +270,9 @@ int PathRequest::parseJson (Json::Value const& jvParams, bool complete)
return PFR_PJ_INVALID;
}
if (jvParams.isMember ("destination_account"))
if (jvParams.isMember (jss::destination_account))
{
if (!raDstAccount.setAccountID (jvParams["destination_account"].asString ()))
if (!raDstAccount.setAccountID (jvParams[jss::destination_account].asString ()))
{
jvStatus = rpcError (rpcDST_ACT_MALFORMED);
return PFR_PJ_INVALID;
@@ -284,10 +284,10 @@ int PathRequest::parseJson (Json::Value const& jvParams, bool complete)
return PFR_PJ_INVALID;
}
if (jvParams.isMember ("destination_amount"))
if (jvParams.isMember (jss::destination_amount))
{
if (! amountFromJsonNoThrow (
saDstAmount, jvParams["destination_amount"]) ||
saDstAmount, jvParams[jss::destination_amount]) ||
(saDstAmount.getCurrency ().isZero () &&
saDstAmount.getIssuer ().isNonZero ()) ||
(saDstAmount.getCurrency () == badCurrency ()) ||
@@ -303,9 +303,9 @@ int PathRequest::parseJson (Json::Value const& jvParams, bool complete)
return PFR_PJ_INVALID;
}
if (jvParams.isMember ("source_currencies"))
if (jvParams.isMember (jss::source_currencies))
{
Json::Value const& jvSrcCur = jvParams["source_currencies"];
Json::Value const& jvSrcCur = jvParams[jss::source_currencies];
if (!jvSrcCur.isArray ())
{
@@ -321,15 +321,15 @@ int PathRequest::parseJson (Json::Value const& jvParams, bool complete)
Currency uCur;
Account uIss;
if (!jvCur.isObject() || !jvCur.isMember ("currency") ||
!to_currency (uCur, jvCur["currency"].asString ()))
if (!jvCur.isObject() || !jvCur.isMember (jss::currency) ||
!to_currency (uCur, jvCur[jss::currency].asString ()))
{
jvStatus = rpcError (rpcSRC_CUR_MALFORMED);
return PFR_PJ_INVALID;
}
if (jvCur.isMember ("issuer") &&
!to_issuer (uIss, jvCur["issuer"].asString ()))
if (jvCur.isMember (jss::issuer) &&
!to_issuer (uIss, jvCur[jss::issuer].asString ()))
{
jvStatus = rpcError (rpcSRC_ISR_MALFORMED);
}
@@ -402,9 +402,9 @@ Json::Value PathRequest::doUpdate (RippleLineCache::ref cache, bool fast)
}
}
jvStatus["source_account"] = raSrcAccount.humanAccountID ();
jvStatus["destination_account"] = raDstAccount.humanAccountID ();
jvStatus["destination_amount"] = saDstAmount.getJson (0);
jvStatus[jss::source_account] = raSrcAccount.humanAccountID ();
jvStatus[jss::destination_account] = raDstAccount.humanAccountID ();
jvStatus[jss::destination_amount] = saDstAmount.getJson (0);
if (!jvId.isNull ())
jvStatus["id"] = jvId;
@@ -526,8 +526,8 @@ Json::Value PathRequest::doUpdate (RippleLineCache::ref cache, bool fast)
Json::Value jvEntry (Json::objectValue);
rc.actualAmountIn.setIssuer (sourceAccount);
jvEntry["source_amount"] = rc.actualAmountIn.getJson (0);
jvEntry["paths_computed"] = spsPaths.getJson (0);
jvEntry[jss::source_amount] = rc.actualAmountIn.getJson (0);
jvEntry[jss::paths_computed] = spsPaths.getJson (0);
found = true;
jvArray.append (jvEntry);
}
@@ -557,7 +557,7 @@ Json::Value PathRequest::doUpdate (RippleLineCache::ref cache, bool fast)
mOwner.reportFull ((ptFullReply-ptCreated).total_milliseconds());
}
jvStatus["alternatives"] = jvArray;
jvStatus[jss::alternatives] = jvArray;
return jvStatus;
}