From b36ca99bffd7dd6223e4df6d757d689027a83138 Mon Sep 17 00:00:00 2001 From: Zachary Michaels Date: Mon, 23 Jun 2014 13:55:01 -0400 Subject: [PATCH] Make wallet address types match RPC call --- src/daemon/command_executor.h | 2 +- src/daemon/command_parser_executor.cpp | 4 ++-- src/daemon/interactive_command_executor.cpp | 2 +- src/daemon/interactive_command_executor.h | 2 +- src/daemon/rpc_command_executor.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/daemon/command_executor.h b/src/daemon/command_executor.h index c6e59fd27..31a597042 100644 --- a/src/daemon/command_executor.h +++ b/src/daemon/command_executor.h @@ -22,7 +22,7 @@ public: virtual bool print_transaction(crypto::hash transaction_hash) = 0; virtual bool print_transaction_pool_long() = 0; virtual bool print_transaction_pool_short() = 0; - virtual bool start_mining(cryptonote::account_public_address address, size_t num_threads) = 0; + virtual bool start_mining(cryptonote::account_public_address address, uint64_t num_threads) = 0; virtual bool stop_mining() = 0; }; diff --git a/src/daemon/command_parser_executor.cpp b/src/daemon/command_parser_executor.cpp index 11f451d43..0d5117afc 100644 --- a/src/daemon/command_parser_executor.cpp +++ b/src/daemon/command_parser_executor.cpp @@ -154,7 +154,7 @@ bool t_command_parser_executor::start_mining(const std::vector& arg { if(!args.size()) { - std::cout << "Please, specify wallet address to mine for: start_mining [threads=1]" << std::endl; + std::cout << "Please specify a wallet address to mine for: start_mining [threads=1]" << std::endl; return true; } @@ -164,7 +164,7 @@ bool t_command_parser_executor::start_mining(const std::vector& arg std::cout << "target account address has wrong format" << std::endl; return true; } - size_t threads_count = 1; + uint64_t threads_count = 1; if(args.size() > 2) { return false; diff --git a/src/daemon/interactive_command_executor.cpp b/src/daemon/interactive_command_executor.cpp index 67ceb4a0d..5f21b9b32 100644 --- a/src/daemon/interactive_command_executor.cpp +++ b/src/daemon/interactive_command_executor.cpp @@ -147,7 +147,7 @@ bool t_interactive_command_executor::print_transaction_pool_short() { return true; } -bool t_interactive_command_executor::start_mining(cryptonote::account_public_address address, size_t num_threads) { +bool t_interactive_command_executor::start_mining(cryptonote::account_public_address address, uint64_t num_threads) { boost::thread::attributes attrs; attrs.set_stack_size(THREAD_STACK_SIZE); diff --git a/src/daemon/interactive_command_executor.h b/src/daemon/interactive_command_executor.h index 71b3124f8..2b7ba1caf 100644 --- a/src/daemon/interactive_command_executor.h +++ b/src/daemon/interactive_command_executor.h @@ -42,7 +42,7 @@ public: bool print_transaction_pool_short() override; - bool start_mining(cryptonote::account_public_address address, size_t num_threads) override; + bool start_mining(cryptonote::account_public_address address, uint64_t num_threads) override; bool stop_mining() override; }; diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index f27f63fec..7e0a7eeab 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -67,7 +67,7 @@ bool t_rpc_command_executor::print_transaction_pool_short() { return true; } -bool t_rpc_command_executor::start_mining(cryptonote::account_public_address address, size_t num_threads) { +bool t_rpc_command_executor::start_mining(cryptonote::account_public_address address, uint64_t num_threads) { std::cout << "start mining" << std::endl; return true; }