neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Add new ParseXXX methods to easily parse UniValue values (#2211)

Browse Source
This commit is contained in:
Alexander Block 2018-08-11 00:33:56 +02:00 committed by UdjinM6
parent 566fa5ec3b
commit 106bab1ae1
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/rpc/server.cpp
View File

@ -24,6 +24,7 @@
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <boost/algorithm/string/case_conv.hpp> // for to_upper() #include <boost/algorithm/string/case_conv.hpp> // for to_upper()
#include <algorithm>
#include <memory> // for unique_ptr #include <memory> // for unique_ptr
#include <unordered_map> #include <unordered_map>
@ -172,6 +173,53 @@ std::vector<unsigned char> ParseHexO(const UniValue& o, std::string strKey)
return ParseHexV(find_value(o, strKey), strKey); return ParseHexV(find_value(o, strKey), strKey);
} }
int32_t ParseInt32V(const UniValue& v, const std::string &strName)
{
std::string strNum = v.getValStr();
int32_t num;
if (!ParseInt32(strNum, &num))
throw JSONRPCError(RPC_INVALID_PARAMETER, strName+" must be a 32bit integer (not '"+strNum+"')");
return num;
}
int64_t ParseInt64V(const UniValue& v, const std::string &strName)
{
std::string strNum = v.getValStr();
int64_t num;
if (!ParseInt64(strNum, &num))
throw JSONRPCError(RPC_INVALID_PARAMETER, strName+" must be a 64bit integer (not '"+strNum+"')");
return num;
}
double ParseDoubleV(const UniValue& v, const std::string &strName)
{
std::string strNum = v.getValStr();
double num;
if (!ParseDouble(strNum, &num))
throw JSONRPCError(RPC_INVALID_PARAMETER, strName+" must be a be number (not '"+strNum+"')");
return num;
}
bool ParseBoolV(const UniValue& v, const std::string &strName)
{
std::string strBool;
if (v.isBool())
return v.get_bool();
else if (v.isNum())
strBool = itostr(v.get_int());
else if (v.isStr())
strBool = v.get_str();
std::transform(strBool.begin(), strBool.end(), strBool.begin(), ::tolower);
if (strBool == "true" || strBool == "yes" || strBool == "1") {
return true;
} else if (strBool == "false" || strBool == "no" || strBool == "0") {
return false;
}
throw JSONRPCError(RPC_INVALID_PARAMETER, strName+" must be true, false, yes, no, 1 or 0 (not '"+strBool+"')");
}
/** /**
* Note: This interface may still be subject to change. * Note: This interface may still be subject to change.
*/ */

5
src/rpc/server.h
View File

@ -187,6 +187,11 @@ extern uint256 ParseHashO(const UniValue& o, std::string strKey);
extern std::vector<unsigned char> ParseHexV(const UniValue& v, std::string strName); extern std::vector<unsigned char> ParseHexV(const UniValue& v, std::string strName);
extern std::vector<unsigned char> ParseHexO(const UniValue& o, std::string strKey); extern std::vector<unsigned char> ParseHexO(const UniValue& o, std::string strKey);
extern int32_t ParseInt32V(const UniValue& v, const std::string &strName);
extern int64_t ParseInt64V(const UniValue& v, const std::string &strName);
extern double ParseDoubleV(const UniValue& v, const std::string &strName);
extern bool ParseBoolV(const UniValue& v, const std::string &strName);
extern int64_t nWalletUnlockTime; extern int64_t nWalletUnlockTime;
extern CAmount AmountFromValue(const UniValue& value); extern CAmount AmountFromValue(const UniValue& value);
extern UniValue ValueFromAmount(const CAmount& amount); extern UniValue ValueFromAmount(const CAmount& amount);