d0s3t3ch/wownero
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-08-15 01:03:23 +00:00
Code Issues Projects Releases Wiki Activity

rpc: fix hard_fork_info RPC

Browse source 
I had never tested it, obviously
This commit is contained in:
moneromooo-monero 2015-10-26 10:17:48 +00:00
parent 6f5c129c92
commit 06c65cb0ef
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/daemon/rpc_command_executor.cpp
View file

@ -971,11 +971,13 @@ bool t_rpc_command_executor::hard_fork_info(uint8_t version)
tools::fail_msg_writer() << fail_message.c_str(); tools::fail_msg_writer() << fail_message.c_str();
return true; 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; return true;
} }

1
src/rpc/core_rpc_server.cpp
View file

@ -889,6 +889,7 @@ namespace cryptonote
res.version = blockchain.get_current_hard_fork_version(); 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.enabled = blockchain.get_hard_fork_voting_info(version, res.window, res.votes, res.threshold, res.voting);
res.state = blockchain.get_hard_fork_state(); res.state = blockchain.get_hard_fork_state();
res.status = CORE_RPC_STATUS_OK;
return true; return true;
#else #else
error_resp.code = CORE_RPC_ERROR_CODE_UNSUPPORTED_RPC; error_resp.code = CORE_RPC_ERROR_CODE_UNSUPPORTED_RPC;

1
src/rpc/core_rpc_server.h
View file

@ -104,6 +104,7 @@ namespace cryptonote
MAP_JON_RPC_WE("getblock", on_get_block, COMMAND_RPC_GET_BLOCK) 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_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("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_JSON_RPC_MAP()
END_URI_MAP2() END_URI_MAP2()