diff options
author | Peter Todd <pete@petertodd.org> | 2013-07-15 02:24:33 -0400 |
---|---|---|
committer | Peter Todd <pete@petertodd.org> | 2013-09-12 22:53:54 -0400 |
commit | 463c9710f56aff957624a03ca82a717d78694440 (patch) | |
tree | 6628328ef16f56cc52c94f0ac43b43cceebedb39 /src/bitcoinrpc.cpp | |
parent | 11a79680b174ec39d462925ea565a23aa8c147ad (diff) | |
download | bitcoin-463c9710f56aff957624a03ca82a717d78694440.tar.xz |
Move Parse{Hash|Hex} to be usable by all RPC code
Diffstat (limited to 'src/bitcoinrpc.cpp')
-rw-r--r-- | src/bitcoinrpc.cpp | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 47c7383564..4e303526b1 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -113,6 +113,34 @@ std::string HexBits(unsigned int nBits) return HexStr(BEGIN(uBits.cBits), END(uBits.cBits)); } +uint256 ParseHashV(const Value& v, string strName) +{ + string strHex; + if (v.type() == str_type) + strHex = v.get_str(); + if (!IsHex(strHex)) // Note: IsHex("") is false + throw JSONRPCError(RPC_INVALID_PARAMETER, strName+" must be hexadecimal string (not '"+strHex+"')"); + uint256 result; + result.SetHex(strHex); + return result; +} +uint256 ParseHashO(const Object& o, string strKey) +{ + return ParseHashV(find_value(o, strKey), strKey); +} +vector<unsigned char> ParseHexV(const Value& v, string strName) +{ + string strHex; + if (v.type() == str_type) + strHex = v.get_str(); + if (!IsHex(strHex)) + throw JSONRPCError(RPC_INVALID_PARAMETER, strName+" must be hexadecimal string (not '"+strHex+"')"); + return ParseHex(strHex); +} +vector<unsigned char> ParseHexO(const Object& o, string strKey) +{ + return ParseHexV(find_value(o, strKey), strKey); +} /// |