From 6f5c129c922a2583b58d8609c1a1a9e078389937 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Mon, 26 Oct 2015 10:17:03 +0000 Subject: [PATCH 1/2] rpc: fix a few commands not working as command line The method name to the "json_rpc" commands are names, not part of URLs. --- src/daemon/rpc_command_executor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index b0fe5945..38d20ec3 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -255,7 +255,7 @@ bool t_rpc_command_executor::print_connections() { if (m_is_rpc) { - if (!m_rpc_client->json_rpc_request(req, res, "/get_connections", fail_message.c_str())) + if (!m_rpc_client->json_rpc_request(req, res, "get_connections", fail_message.c_str())) { return true; } @@ -880,7 +880,7 @@ bool t_rpc_command_executor::out_peers(uint64_t limit) if (m_is_rpc) { - if (!m_rpc_client->json_rpc_request(req, res, "/out_peers", fail_message.c_str())) + if (!m_rpc_client->json_rpc_request(req, res, "out_peers", fail_message.c_str())) { return true; } @@ -959,7 +959,7 @@ bool t_rpc_command_executor::hard_fork_info(uint8_t version) if (m_is_rpc) { - if (!m_rpc_client->json_rpc_request(req, res, "/hard_fork_info", fail_message.c_str())) + if (!m_rpc_client->json_rpc_request(req, res, "hard_fork_info", fail_message.c_str())) { return true; } From 06c65cb0ef5b93c5d78ac3235e9e5f51952db070 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Mon, 26 Oct 2015 10:17:48 +0000 Subject: [PATCH 2/2] rpc: fix hard_fork_info RPC I had never tested it, obviously --- src/daemon/rpc_command_executor.cpp | 10 ++++++---- src/rpc/core_rpc_server.cpp | 1 + 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 38d20ec3..8e034727 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 08005ec7..6cfcec08 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 4f62f92a..1fbd0981 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()