diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-08-16 12:43:38 -0700 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-08-16 12:43:38 -0700 |
| commit | a08df6eb1beaf442ef6d9b27c1f47497b74d3471 (patch) | |
| tree | ef0f0ac25c2932f26cdd0a389a4ad44ec2a97826 /src/rpc | |
| parent | Merge pull request #6601 (diff) | |
| parent | Change ZMQ-JSON txextra to hex and remove unnecessary base fields (diff) | |
| download | monero-a08df6eb1beaf442ef6d9b27c1f47497b74d3471.tar.xz | |
Merge pull request #6603
4e2377995 Change ZMQ-JSON txextra to hex and remove unnecessary base fields (Lee Clagett)
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/daemon_rpc_version.h | 2 | ||||
| -rw-r--r-- | src/rpc/message.cpp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/rpc/daemon_rpc_version.h b/src/rpc/daemon_rpc_version.h index d178a82bc..2955d5449 100644 --- a/src/rpc/daemon_rpc_version.h +++ b/src/rpc/daemon_rpc_version.h @@ -35,7 +35,7 @@ namespace rpc { static const uint32_t DAEMON_RPC_VERSION_ZMQ_MINOR = 0; -static const uint32_t DAEMON_RPC_VERSION_ZMQ_MAJOR = 1; +static const uint32_t DAEMON_RPC_VERSION_ZMQ_MAJOR = 2; static const uint32_t DAEMON_RPC_VERSION_ZMQ = DAEMON_RPC_VERSION_ZMQ_MINOR + (DAEMON_RPC_VERSION_ZMQ_MAJOR << 16); diff --git a/src/rpc/message.cpp b/src/rpc/message.cpp index 3aefbd76e..f6c6b887d 100644 --- a/src/rpc/message.cpp +++ b/src/rpc/message.cpp @@ -65,8 +65,6 @@ const rapidjson::Value& get_method_field(const rapidjson::Value& src) void Message::toJson(rapidjson::Writer<epee::byte_stream>& dest) const { dest.StartObject(); - INSERT_INTO_JSON_OBJECT(dest, status, status); - INSERT_INTO_JSON_OBJECT(dest, error_details, error_details); INSERT_INTO_JSON_OBJECT(dest, rpc_version, DAEMON_RPC_VERSION_ZMQ); doToJson(dest); dest.EndObject(); @@ -74,8 +72,6 @@ void Message::toJson(rapidjson::Writer<epee::byte_stream>& dest) const void Message::fromJson(const rapidjson::Value& val) { - GET_FROM_JSON_OBJECT(val, status, status); - GET_FROM_JSON_OBJECT(val, error_details, error_details); GET_FROM_JSON_OBJECT(val, rpc_version, rpc_version); } |