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

simplewallet: fixed incorrect handling of daemon-address, daemon-host and daemon-port

Browse source
This commit is contained in:
sowle 2025-04-09 15:39:19 +03:00
parent 144d403c8b
commit f65578f5a5
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/simplewallet/simplewallet.cpp
View file

@ -417,22 +417,15 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
{
handle_command_line(vm);
if (command_line::has_arg(vm, arg_daemon_address) && (command_line::has_arg(vm, arg_daemon_host) || command_line::has_arg(vm, arg_daemon_port)))
if (!m_daemon_address.empty() && (!m_daemon_host.empty() || 0 != m_daemon_port))
{
fail_msg_writer() << "Please use either --daemon-address=\"host:port\" or specify both --daemon-host=\"host\" and --daemon-port=\"port\".";
return false;
}
if (!m_daemon_address.empty() && !m_daemon_host.empty() && 0 != m_daemon_port)
{
fail_msg_writer() << "you can't specify daemon host or port several times";
fail_msg_writer() << "please use either --daemon-address=\"host:port\" or specify both --daemon-host=\"host\" and --daemon-port=\"port\".";
return false;
}
if (m_wallet_file.empty() && m_generate_new.empty() && m_restore_wallet.empty() && m_generate_new_aw.empty())
{
fail_msg_writer() << "you must specify --wallet-file, --generate-new-wallet, --generate-new-auditable-wallet, --restore-wallet";
fail_msg_writer() << "you must specify --wallet-file, --generate-new-wallet, --generate-new-auditable-wallet, or --restore-wallet";
return false;
}