diff options
| author | Jonas Schnelli <jonas.schnelli@include7.ch> | 2015-05-13 21:29:19 +0200 |
|---|---|---|
| committer | Jonas Schnelli <jonas.schnelli@include7.ch> | 2015-06-04 09:16:06 +0200 |
| commit | 3df0411ad9fd75fb27af53e44835d41f5480fe3f (patch) | |
| tree | 99e1a50e6b36e69c4429129d87567890b5878b3c /src/rpcprotocol.cpp | |
| parent | 1f263c899ee0756ed9ed133f35bec18bdef20cdc (diff) | |
| download | bitcoin-3df0411ad9fd75fb27af53e44835d41f5480fe3f.tar.xz | |
remove JSON Spirit UniValue wrapper
Diffstat (limited to 'src/rpcprotocol.cpp')
| -rw-r--r-- | src/rpcprotocol.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rpcprotocol.cpp b/src/rpcprotocol.cpp index 9b422894ef..953e476022 100644 --- a/src/rpcprotocol.cpp +++ b/src/rpcprotocol.cpp @@ -256,7 +256,7 @@ int ReadHTTPMessage(std::basic_istream<char>& stream, map<string, string JSONRPCRequest(const string& strMethod, const Array& params, const Value& id) { - Object request(UniValue::VOBJ); + UniValue request(UniValue::VOBJ); request.push_back(Pair("method", strMethod)); request.push_back(Pair("params", params)); request.push_back(Pair("id", id)); @@ -265,7 +265,7 @@ string JSONRPCRequest(const string& strMethod, const Array& params, const Value& Object JSONRPCReplyObj(const Value& result, const Value& error, const Value& id) { - Object reply(UniValue::VOBJ); + UniValue reply(UniValue::VOBJ); if (!error.isNull()) reply.push_back(Pair("result", NullUniValue)); else @@ -277,11 +277,11 @@ Object JSONRPCReplyObj(const Value& result, const Value& error, const Value& id) string JSONRPCReply(const Value& result, const Value& error, const Value& id) { - Object reply = JSONRPCReplyObj(result, error, id); + UniValue reply = JSONRPCReplyObj(result, error, id); return reply.write() + "\n"; } -Object JSONRPCError(int code, const string& message) +UniValue JSONRPCError(int code, const string& message) { UniValue error(UniValue::VOBJ); error.push_back(Pair("code", code)); |