diff options
Diffstat (limited to 'src/daemon')
-rw-r--r-- | src/daemon/command_parser_executor.cpp | 16 | ||||
-rw-r--r-- | src/daemon/command_parser_executor.h | 2 | ||||
-rw-r--r-- | src/daemon/command_server.cpp | 2 | ||||
-rw-r--r-- | src/daemon/rpc_command_executor.cpp | 10 | ||||
-rw-r--r-- | src/daemon/rpc_command_executor.h | 2 |
5 files changed, 16 insertions, 16 deletions
diff --git a/src/daemon/command_parser_executor.cpp b/src/daemon/command_parser_executor.cpp index 0d810bc32..5d7ed6cc0 100644 --- a/src/daemon/command_parser_executor.cpp +++ b/src/daemon/command_parser_executor.cpp @@ -456,23 +456,23 @@ bool t_command_parser_executor::print_coinbase_tx_sum(const std::vector<std::str { if(!args.size()) { - std::cout << "need block index parameter" << std::endl; + std::cout << "need block height parameter" << std::endl; return false; } - uint64_t start_index = 0; - uint64_t end_index = 0; - if(!epee::string_tools::get_xtype_from_string(start_index, args[0])) + uint64_t height = 0; + uint64_t count = 0; + if(!epee::string_tools::get_xtype_from_string(height, args[0])) { - std::cout << "wrong starter block index parameter" << std::endl; + std::cout << "wrong starter block height parameter" << std::endl; return false; } - if(args.size() >1 && !epee::string_tools::get_xtype_from_string(end_index, args[1])) + if(args.size() >1 && !epee::string_tools::get_xtype_from_string(count, args[1])) { - std::cout << "wrong end block index parameter" << std::endl; + std::cout << "wrong count parameter" << std::endl; return false; } - return m_executor.print_coinbase_tx_sum(start_index, end_index); + return m_executor.print_coinbase_tx_sum(height, count); } } // namespace daemonize diff --git a/src/daemon/command_parser_executor.h b/src/daemon/command_parser_executor.h index 316c9e8a9..6a984aa71 100644 --- a/src/daemon/command_parser_executor.h +++ b/src/daemon/command_parser_executor.h @@ -103,7 +103,7 @@ public: bool start_save_graph(const std::vector<std::string>& args); bool stop_save_graph(const std::vector<std::string>& args); - + bool hard_fork_info(const std::vector<std::string>& args); bool show_bans(const std::vector<std::string>& args); diff --git a/src/daemon/command_server.cpp b/src/daemon/command_server.cpp index 2f3643779..1418b920f 100644 --- a/src/daemon/command_server.cpp +++ b/src/daemon/command_server.cpp @@ -218,7 +218,7 @@ t_command_server::t_command_server( m_command_lookup.set_handler( "print_coinbase_tx_sum" , std::bind(&t_command_parser_executor::print_coinbase_tx_sum, &m_parser, p::_1) - , "Print sum of coinbase transactions (start index, end index)" + , "Print sum of coinbase transactions (start height, block count)" ); } diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index 80d330e92..bf154597c 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -1270,14 +1270,14 @@ bool t_rpc_command_executor::output_histogram(uint64_t min_count, uint64_t max_c return true; } -bool t_rpc_command_executor::print_coinbase_tx_sum(uint64_t start_block_index, uint64_t end_block_index) +bool t_rpc_command_executor::print_coinbase_tx_sum(uint64_t height, uint64_t count) { cryptonote::COMMAND_RPC_GET_COINBASE_TX_SUM::request req; cryptonote::COMMAND_RPC_GET_COINBASE_TX_SUM::response res; epee::json_rpc::error error_resp; - req.start_height = start_block_index; - req.end_height = end_block_index; + req.height = height; + req.count = count; std::string fail_message = "Unsuccessful"; @@ -1297,8 +1297,8 @@ bool t_rpc_command_executor::print_coinbase_tx_sum(uint64_t start_block_index, u } } - tools::msg_writer() << "Sum of coinbase transactions between block indexes " - << start_block_index << " and " << end_block_index << " (inclusive) is " + tools::msg_writer() << "Sum of coinbase transactions between block heights [" + << height << ", " << (height + count) << ") is " << cryptonote::print_money(res.amount); return true; } diff --git a/src/daemon/rpc_command_executor.h b/src/daemon/rpc_command_executor.h index aa2b89ac2..c097453e7 100644 --- a/src/daemon/rpc_command_executor.h +++ b/src/daemon/rpc_command_executor.h @@ -134,7 +134,7 @@ public: bool output_histogram(uint64_t min_count, uint64_t max_count); - bool print_coinbase_tx_sum(uint64_t start_block_index, uint64_t end_block_index); + bool print_coinbase_tx_sum(uint64_t height, uint64_t count); }; } // namespace daemonize |