Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

got rid of maintain key in command line

Browse source
This commit is contained in:
cryptozoidberg 2019-07-16 19:37:10 +02:00
parent 9e9f3be0f6
commit a37ef693ac
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/connectivity_tool/conn_tool.cpp
View file

@ -37,10 +37,10 @@ using namespace nodetool;
namespace
{
const command_line::arg_descriptor<std::string> arg_ip = {"ip", "set ip"};
const command_line::arg_descriptor<std::string> arg_ip = {"ip", "set ip", "127.0.0.1", false};
const command_line::arg_descriptor<size_t> arg_port = {"port", "set port"};
const command_line::arg_descriptor<size_t> arg_rpc_port = {"rpc-port", "set rpc port", RPC_DEFAULT_PORT};
const command_line::arg_descriptor<uint32_t> arg_timeout = {"timeout", "set timeout", 5000};
const command_line::arg_descriptor<size_t> arg_rpc_port = {"rpc-port", "set rpc port", RPC_DEFAULT_PORT, false};
const command_line::arg_descriptor<uint32_t> arg_timeout = {"timeout", "set timeout", 5000, false};
const command_line::arg_descriptor<std::string> arg_priv_key = {"private-key", "private key to subscribe debug command", "", true};
const command_line::arg_descriptor<uint64_t> arg_peer_id = {"peer-id", "peerid if known(if not - will be requested)", 0};
const command_line::arg_descriptor<bool> arg_generate_keys = {"generate-keys-pair", "generate private and public keys pair"};
@ -712,13 +712,19 @@ bool handle_request_stat(po::variables_map& vm, peerid_type peer_id)
//---------------------------------------------------------------------------------------------------------------
bool get_private_key(crypto::secret_key& pk, po::variables_map& vm)
{
if(!command_line::has_arg(vm, arg_priv_key))
std::string key_str;
if(command_line::has_arg(vm, arg_priv_key))
{
std::cout << "ERROR: secret key not set" << ENDL;
return false;
key_str = command_line::get_arg(vm, arg_priv_key);
}
else
{
std::cout << "Enter maintain private key:";
std::cin >> key_str;
}
if(!string_tools::hex_to_pod(command_line::get_arg(vm, arg_priv_key) , pk))
if(!string_tools::hex_to_pod(key_str, pk))
{
std::cout << "ERROR: wrong secret key set" << ENDL;
return false;
@ -796,17 +802,20 @@ bool handle_increment_build_no(po::variables_map& vm)
bool handle_update_maintainers_info(po::variables_map& vm)
{
log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL);
size_t rpc_port = RPC_DEFAULT_PORT;
if(!command_line::has_arg(vm, arg_rpc_port))
{
std::cout << "ERROR: rpc port not set" << ENDL;
return false;
}
crypto::secret_key prvk = AUTO_VAL_INIT(prvk);
crypto::secret_key prvk = AUTO_VAL_INIT(prvk);
if(!get_private_key(prvk, vm))
{
std::cout << "ERROR: secret key error" << ENDL;
return false;
}
std::string path = command_line::get_arg(vm, arg_upate_maintainers_info);
epee::net_utils::http::http_simple_client http_client;