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

Cleanup some Json::Value methods:

Browse Source 
* Rename isArray to isArrayOrNull
* Rename isObject to isObjectOrNull
* Introduce isArray and isObject
* Change as many uses of isArrayorNull to isArray as possible
* Change as many uses of isObjectorNull to isObject as possible
* Reject null JSON arrays for subscribe and unsubscribe
This commit is contained in:
Howard Hinnant
2018-02-01 15:23:41 -05:00
committed by Mike Ellery
parent 20defb4844
commit 1a245234f1
24 changed files with 90 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ripple/net/impl/RPCCall.cpp
View File

@@ -173,7 +173,7 @@ private:
{
Json::Value v (Json::objectValue);
if (jvParams.isArray () && (jvParams.size () > 0))
if (jvParams.isArray() && (jvParams.size () > 0))
v[jss::params] = jvParams;
return v;
@@ -513,7 +513,7 @@ private:
if (reader.parse (jvParams[1u].asString (), jvRequest))
{
if (!jvRequest.isObject ())
if (!jvRequest.isObjectOrNull ())
return rpcError (rpcINVALID_PARAMS);
jvRequest[jss::method] = jvParams[0u];
@@ -544,7 +544,8 @@ private:
jv.isMember(jss::id) && jv.isMember(jss::method))
{
if (jv.isMember(jss::params) &&
!(jv[jss::params].isArray() || jv[jss::params].isObject()))
!(jv[jss::params].isNull() || jv[jss::params].isArray() ||
jv[jss::params].isObject()))
return false;
return true;
}

2
src/ripple/net/impl/RPCErr.cpp
View File

@@ -35,7 +35,7 @@ Json::Value rpcError (int iError, Json::Value jvResult)
// VFALCO NOTE Deprecated function
bool isRpcError (Json::Value jvResult)
{
return jvResult.isObject () && jvResult.isMember (jss::error);
return jvResult.isObject() && jvResult.isMember (jss::error);
}
} // ripple