From b776c7256852c85d5d518a663e6ff8acbab17024 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sat, 7 Oct 2017 16:35:49 +0100 Subject: daemon: use @N syntax to output_histogram for specific amounts Makes debugging tx verification easier --- src/daemon/command_parser_executor.cpp | 32 +++++++++++++++++++++++--------- src/daemon/rpc_command_executor.cpp | 3 ++- src/daemon/rpc_command_executor.h | 2 +- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/daemon/command_parser_executor.cpp b/src/daemon/command_parser_executor.cpp index af46453cd..27363e7c6 100644 --- a/src/daemon/command_parser_executor.cpp +++ b/src/daemon/command_parser_executor.cpp @@ -493,20 +493,34 @@ bool t_command_parser_executor::flush_txpool(const std::vector& arg bool t_command_parser_executor::output_histogram(const std::vector& args) { - if (args.size() > 2) return false; - + std::vector amounts; uint64_t min_count = 3; uint64_t max_count = 0; + size_t n_raw = 0; - if (args.size() >= 1) - { - min_count = boost::lexical_cast(args[0]); - } - if (args.size() >= 2) + for (size_t n = 0; n < args.size(); ++n) { - max_count = boost::lexical_cast(args[1]); + if (args[n][0] == '@') + { + amounts.push_back(boost::lexical_cast(args[n].c_str() + 1)); + } + else if (n_raw == 0) + { + min_count = boost::lexical_cast(args[n]); + n_raw++; + } + else if (n_raw == 1) + { + max_count = boost::lexical_cast(args[n]); + n_raw++; + } + else + { + std::cout << "Invalid syntax: more than two non-amount parameters" << std::endl; + return true; + } } - return m_executor.output_histogram(min_count, max_count); + return m_executor.output_histogram(amounts, min_count, max_count); } bool t_command_parser_executor::print_coinbase_tx_sum(const std::vector& args) diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index ef593237c..10c04b246 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -1490,13 +1490,14 @@ bool t_rpc_command_executor::flush_txpool(const std::string &txid) 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 &amounts, uint64_t min_count, uint64_t max_count) { cryptonote::COMMAND_RPC_GET_OUTPUT_HISTOGRAM::request req; cryptonote::COMMAND_RPC_GET_OUTPUT_HISTOGRAM::response res; std::string fail_message = "Unsuccessful"; epee::json_rpc::error error_resp; + req.amounts = amounts; req.min_count = min_count; req.max_count = max_count; req.unlocked = false; diff --git a/src/daemon/rpc_command_executor.h b/src/daemon/rpc_command_executor.h index d79707a6f..c9d0ac671 100644 --- a/src/daemon/rpc_command_executor.h +++ b/src/daemon/rpc_command_executor.h @@ -137,7 +137,7 @@ public: bool flush_txpool(const std::string &txid); - bool output_histogram(uint64_t min_count, uint64_t max_count); + bool output_histogram(const std::vector &amounts, uint64_t min_count, uint64_t max_count); bool print_coinbase_tx_sum(uint64_t height, uint64_t count); -- cgit v1.2.3