monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 16:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2599

Browse source 
b776c725 daemon: use @N syntax to output_histogram for specific amounts (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-10-15 18:48:19 +02:00
commit f484b162db
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/daemon/command_parser_executor.cpp
View file

@ -503,20 +503,34 @@ bool t_command_parser_executor::flush_txpool(const std::vector<std::string>& arg
bool t_command_parser_executor::output_histogram(const std::vector<std::string>& args) bool t_command_parser_executor::output_histogram(const std::vector<std::string>& args)
{ {
if (args.size() > 2) return false; std::vector<uint64_t> amounts;
uint64_t min_count = 3; uint64_t min_count = 3;
uint64_t max_count = 0; uint64_t max_count = 0;
size_t n_raw = 0;
if (args.size() >= 1) for (size_t n = 0; n < args.size(); ++n)
{ {
min_count = boost::lexical_cast<uint64_t>(args[0]); if (args[n][0] == '@')
{
amounts.push_back(boost::lexical_cast<uint64_t>(args[n].c_str() + 1));
}
else if (n_raw == 0)
{
min_count = boost::lexical_cast<uint64_t>(args[n]);
n_raw++;
}
else if (n_raw == 1)
{
max_count = boost::lexical_cast<uint64_t>(args[n]);
n_raw++;
}
else
{
std::cout << "Invalid syntax: more than two non-amount parameters" << std::endl;
return true;
}
} }
if (args.size() >= 2) return m_executor.output_histogram(amounts, min_count, max_count);
{
max_count = boost::lexical_cast<uint64_t>(args[1]);
}
return m_executor.output_histogram(min_count, max_count);
} }
bool t_command_parser_executor::print_coinbase_tx_sum(const std::vector<std::string>& args) bool t_command_parser_executor::print_coinbase_tx_sum(const std::vector<std::string>& args)

3
src/daemon/rpc_command_executor.cpp
View file

@ -1490,13 +1490,14 @@ bool t_rpc_command_executor::flush_txpool(const std::string &txid)
return true; return true;
} }
bool t_rpc_command_executor::output_histogram(uint64_t min_count, uint64_t max_count) bool t_rpc_command_executor::output_histogram(const std::vector<uint64_t> &amounts, uint64_t min_count, uint64_t max_count)
{ {
cryptonote::COMMAND_RPC_GET_OUTPUT_HISTOGRAM::request req; cryptonote::COMMAND_RPC_GET_OUTPUT_HISTOGRAM::request req;
cryptonote::COMMAND_RPC_GET_OUTPUT_HISTOGRAM::response res; cryptonote::COMMAND_RPC_GET_OUTPUT_HISTOGRAM::response res;
std::string fail_message = "Unsuccessful"; std::string fail_message = "Unsuccessful";
epee::json_rpc::error error_resp; epee::json_rpc::error error_resp;
req.amounts = amounts;
req.min_count = min_count; req.min_count = min_count;
req.max_count = max_count; req.max_count = max_count;
req.unlocked = false; req.unlocked = false;

2
src/daemon/rpc_command_executor.h
View file

@ -137,7 +137,7 @@ public:
bool flush_txpool(const std::string &txid); bool flush_txpool(const std::string &txid);
bool output_histogram(uint64_t min_count, uint64_t max_count); bool output_histogram(const std::vector<uint64_t> &amounts, uint64_t min_count, uint64_t max_count);
bool print_coinbase_tx_sum(uint64_t height, uint64_t count); bool print_coinbase_tx_sum(uint64_t height, uint64_t count);