diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-10-26 10:17:48 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-10-26 10:17:48 +0000 |
| commit | 06c65cb0ef5b93c5d78ac3235e9e5f51952db070 (patch) | |
| tree | 4c56ae6cb23abc1b501d6db5d360e279d2c3c449 | |
| parent | rpc: fix a few commands not working as command line (diff) | |
| download | monero-06c65cb0ef5b93c5d78ac3235e9e5f51952db070.tar.xz | |
rpc: fix hard_fork_info RPC
I had never tested it, obviously
| -rw-r--r-- | src/daemon/rpc_command_executor.cpp | 10 | ||||
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 1 | ||||
| -rw-r--r-- | src/rpc/core_rpc_server.h | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index 38d20ec39..8e0347279 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -971,11 +971,13 @@ bool t_rpc_command_executor::hard_fork_info(uint8_t version) tools::fail_msg_writer() << fail_message.c_str(); return true; } - version = version > 0 ? version : res.voting; - tools::msg_writer() << "version " << (uint32_t)version << " " << (res.enabled ? "enabled" : "not enabled") << - ", " << res.votes << "/" << res.window << " votes, threshold " << res.threshold; - tools::msg_writer() << "current version " << (uint32_t)res.version << ", voting for version " << (uint32_t)res.voting; } + + version = version > 0 ? version : res.voting; + tools::msg_writer() << "version " << (uint32_t)version << " " << (res.enabled ? "enabled" : "not enabled") << + ", " << res.votes << "/" << res.window << " votes, threshold " << res.threshold; + tools::msg_writer() << "current version " << (uint32_t)res.version << ", voting for version " << (uint32_t)res.voting; + return true; } diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 08005ec72..6cfcec08c 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -889,6 +889,7 @@ namespace cryptonote res.version = blockchain.get_current_hard_fork_version(); res.enabled = blockchain.get_hard_fork_voting_info(version, res.window, res.votes, res.threshold, res.voting); res.state = blockchain.get_hard_fork_state(); + res.status = CORE_RPC_STATUS_OK; return true; #else error_resp.code = CORE_RPC_ERROR_CODE_UNSUPPORTED_RPC; diff --git a/src/rpc/core_rpc_server.h b/src/rpc/core_rpc_server.h index 4f62f92ac..1fbd0981f 100644 --- a/src/rpc/core_rpc_server.h +++ b/src/rpc/core_rpc_server.h @@ -104,6 +104,7 @@ namespace cryptonote MAP_JON_RPC_WE("getblock", on_get_block, COMMAND_RPC_GET_BLOCK) MAP_JON_RPC_WE("get_connections", on_get_connections, COMMAND_RPC_GET_CONNECTIONS) MAP_JON_RPC_WE("get_info", on_get_info_json, COMMAND_RPC_GET_INFO) + MAP_JON_RPC_WE("hard_fork_info", on_hard_fork_info, COMMAND_RPC_HARD_FORK_INFO) END_JSON_RPC_MAP() END_URI_MAP2() |