changed params from start/end index to height/count

This commit is contained in:
Dion Ahmetaj 2016-10-10 17:19:36 -04:00
parent e95d3f359b
commit dd6c44327b
10 changed files with 27 additions and 27 deletions

View file

@ -616,12 +616,12 @@ namespace cryptonote
return true; return true;
} }
//----------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------
uint64_t core::get_coinbase_tx_sum(const uint64_t start_height, const uint64_t end_height) uint64_t core::get_coinbase_tx_sum(const uint64_t start_offset, const uint64_t count)
{ {
std::list<block> blocks; std::list<block> blocks;
uint64_t coinbase_tx_sum = 0; uint64_t coinbase_tx_sum = 0;
uint64_t current_index = start_height; uint64_t current_index = start_offset;
this->get_blocks(start_height, end_height - start_height, blocks); this->get_blocks(start_offset, count, blocks);
BOOST_FOREACH(auto& b, blocks) BOOST_FOREACH(auto& b, blocks)
{ {
coinbase_tx_sum += get_outs_money_amount(b.miner_tx); coinbase_tx_sum += get_outs_money_amount(b.miner_tx);

View file

@ -605,7 +605,7 @@ namespace cryptonote
* *
* @return the number of blocks to sync in one go * @return the number of blocks to sync in one go
*/ */
uint64_t get_coinbase_tx_sum(const uint64_t start_height, const uint64_t end_height); uint64_t get_coinbase_tx_sum(const uint64_t start_offset, const uint64_t count);
private: private:

View file

@ -456,23 +456,23 @@ bool t_command_parser_executor::print_coinbase_tx_sum(const std::vector<std::str
{ {
if(!args.size()) if(!args.size())
{ {
std::cout << "need block index parameter" << std::endl; std::cout << "need block height parameter" << std::endl;
return false; return false;
} }
uint64_t start_index = 0; uint64_t height = 0;
uint64_t end_index = 0; uint64_t count = 0;
if(!epee::string_tools::get_xtype_from_string(start_index, args[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; 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 false;
} }
return m_executor.print_coinbase_tx_sum(start_index, end_index); return m_executor.print_coinbase_tx_sum(height, count);
} }
} // namespace daemonize } // namespace daemonize

View file

@ -103,7 +103,7 @@ public:
bool start_save_graph(const std::vector<std::string>& args); bool start_save_graph(const std::vector<std::string>& args);
bool stop_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 hard_fork_info(const std::vector<std::string>& args);
bool show_bans(const std::vector<std::string>& args); bool show_bans(const std::vector<std::string>& args);

View file

@ -218,7 +218,7 @@ t_command_server::t_command_server(
m_command_lookup.set_handler( m_command_lookup.set_handler(
"print_coinbase_tx_sum" "print_coinbase_tx_sum"
, std::bind(&t_command_parser_executor::print_coinbase_tx_sum, &m_parser, p::_1) , 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)"
); );
} }

View file

@ -1270,14 +1270,14 @@ bool t_rpc_command_executor::output_histogram(uint64_t min_count, uint64_t max_c
return true; 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::request req;
cryptonote::COMMAND_RPC_GET_COINBASE_TX_SUM::response res; cryptonote::COMMAND_RPC_GET_COINBASE_TX_SUM::response res;
epee::json_rpc::error error_resp; epee::json_rpc::error error_resp;
req.start_height = start_block_index; req.height = height;
req.end_height = end_block_index; req.count = count;
std::string fail_message = "Unsuccessful"; 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 " tools::msg_writer() << "Sum of coinbase transactions between block heights ["
<< start_block_index << " and " << end_block_index << " (inclusive) is " << height << ", " << (height + count) << ") is "
<< cryptonote::print_money(res.amount); << cryptonote::print_money(res.amount);
return true; return true;
} }

View file

@ -134,7 +134,7 @@ public:
bool output_histogram(uint64_t min_count, uint64_t max_count); 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 } // namespace daemonize

View file

@ -1268,7 +1268,7 @@ namespace cryptonote
//------------------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------------------
bool core_rpc_server::on_get_coinbase_tx_sum(const COMMAND_RPC_GET_COINBASE_TX_SUM::request& req, COMMAND_RPC_GET_COINBASE_TX_SUM::response& res, epee::json_rpc::error& error_resp) bool core_rpc_server::on_get_coinbase_tx_sum(const COMMAND_RPC_GET_COINBASE_TX_SUM::request& req, COMMAND_RPC_GET_COINBASE_TX_SUM::response& res, epee::json_rpc::error& error_resp)
{ {
res.amount = m_core.get_coinbase_tx_sum(req.start_height, req.end_height); res.amount = m_core.get_coinbase_tx_sum(req.height, req.count);
return true; return true;
} }
//------------------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------------------

View file

@ -128,8 +128,8 @@ namespace cryptonote
bool on_send_raw_tx(const COMMAND_RPC_SEND_RAW_TX::request& req, COMMAND_RPC_SEND_RAW_TX::response& res); bool on_send_raw_tx(const COMMAND_RPC_SEND_RAW_TX::request& req, COMMAND_RPC_SEND_RAW_TX::response& res);
bool on_start_mining(const COMMAND_RPC_START_MINING::request& req, COMMAND_RPC_START_MINING::response& res); bool on_start_mining(const COMMAND_RPC_START_MINING::request& req, COMMAND_RPC_START_MINING::response& res);
bool on_stop_mining(const COMMAND_RPC_STOP_MINING::request& req, COMMAND_RPC_STOP_MINING::response& res); bool on_stop_mining(const COMMAND_RPC_STOP_MINING::request& req, COMMAND_RPC_STOP_MINING::response& res);
bool on_mining_status(const COMMAND_RPC_MINING_STATUS::request& req, COMMAND_RPC_MINING_STATUS::response& res); bool on_mining_status(const COMMAND_RPC_MINING_STATUS::request& req, COMMAND_RPC_MINING_STATUS::response& res);
bool on_get_random_outs(const COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::request& req, COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::response& res); bool on_get_random_outs(const COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::request& req, COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::response& res);
bool on_get_outs(const COMMAND_RPC_GET_OUTPUTS::request& req, COMMAND_RPC_GET_OUTPUTS::response& res); bool on_get_outs(const COMMAND_RPC_GET_OUTPUTS::request& req, COMMAND_RPC_GET_OUTPUTS::response& res);
bool on_get_random_rct_outs(const COMMAND_RPC_GET_RANDOM_RCT_OUTPUTS::request& req, COMMAND_RPC_GET_RANDOM_RCT_OUTPUTS::response& res); bool on_get_random_rct_outs(const COMMAND_RPC_GET_RANDOM_RCT_OUTPUTS::request& req, COMMAND_RPC_GET_RANDOM_RCT_OUTPUTS::response& res);
bool on_get_info(const COMMAND_RPC_GET_INFO::request& req, COMMAND_RPC_GET_INFO::response& res); bool on_get_info(const COMMAND_RPC_GET_INFO::request& req, COMMAND_RPC_GET_INFO::response& res);

View file

@ -1231,12 +1231,12 @@ namespace cryptonote
{ {
struct request struct request
{ {
uint64_t start_height; uint64_t height;
uint64_t end_height; uint64_t count;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(start_height); KV_SERIALIZE(height);
KV_SERIALIZE(end_height); KV_SERIALIZE(count);
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()
}; };