Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplewallet: remove redundant messages on daemon connection failure 

try_connect_to_daemon with silent=false already prints failure message
This commit is contained in:
stoffu 2018-11-02 23:22:46 +09:00
parent 963d247154
commit c22e85fe1a
No known key found for this signature in database
GPG Key ID: 41DAB8343A9EC012
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/simplewallet/simplewallet.cpp
View File

@ -780,10 +780,7 @@ bool simple_wallet::payment_id(const std::vector<std::string> &args/* = std::vec
bool simple_wallet::print_fee_info(const std::vector<std::string> &args/* = std::vector<std::string>()*/) bool simple_wallet::print_fee_info(const std::vector<std::string> &args/* = std::vector<std::string>()*/)
{ {
if (!try_connect_to_daemon()) if (!try_connect_to_daemon())
{
fail_msg_writer() << tr("Cannot connect to daemon");
return true; return true;
}
const bool per_byte = m_wallet->use_fork_rules(HF_VERSION_PER_BYTE_FEE); const bool per_byte = m_wallet->use_fork_rules(HF_VERSION_PER_BYTE_FEE);
const uint64_t base_fee = m_wallet->get_base_fee(); const uint64_t base_fee = m_wallet->get_base_fee();
const char *base = per_byte ? "byte" : "kB"; const char *base = per_byte ? "byte" : "kB";
@ -4608,10 +4605,7 @@ bool simple_wallet::print_ring_members(const std::vector<tools::wallet2::pending
{ {
uint32_t version; uint32_t version;
if (!try_connect_to_daemon(false, &version)) if (!try_connect_to_daemon(false, &version))
{
fail_msg_writer() << tr("failed to connect to the daemon");
return false; return false;
}
// available for RPC version 1.4 or higher // available for RPC version 1.4 or higher
if (version < MAKE_CORE_RPC_VERSION(1, 4)) if (version < MAKE_CORE_RPC_VERSION(1, 4))
return true; return true;
@ -6451,10 +6445,7 @@ bool simple_wallet::get_spend_proof(const std::vector<std::string> &args)
} }
if (!try_connect_to_daemon()) if (!try_connect_to_daemon())
{
fail_msg_writer() << tr("failed to connect to the daemon");
return true; return true;
}
SCOPED_WALLET_UNLOCK(); SCOPED_WALLET_UNLOCK();
@ -6489,10 +6480,7 @@ bool simple_wallet::check_spend_proof(const std::vector<std::string> &args)
} }
if (!try_connect_to_daemon()) if (!try_connect_to_daemon())
{
fail_msg_writer() << tr("failed to connect to the daemon");
return true; return true;
}
std::string sig_str; std::string sig_str;
if (!epee::file_io_utils::load_file_to_string(args[1], sig_str)) if (!epee::file_io_utils::load_file_to_string(args[1], sig_str))
@ -6546,10 +6534,7 @@ bool simple_wallet::get_reserve_proof(const std::vector<std::string> &args)
} }
if (!try_connect_to_daemon()) if (!try_connect_to_daemon())
{
fail_msg_writer() << tr("failed to connect to the daemon");
return true; return true;
}
SCOPED_WALLET_UNLOCK(); SCOPED_WALLET_UNLOCK();
@ -6577,10 +6562,7 @@ bool simple_wallet::check_reserve_proof(const std::vector<std::string> &args)
} }
if (!try_connect_to_daemon()) if (!try_connect_to_daemon())
{
fail_msg_writer() << tr("failed to connect to the daemon");
return true; return true;
}
cryptonote::address_parse_info info; cryptonote::address_parse_info info;
if(!cryptonote::get_account_address_from_str_or_url(info, m_wallet->nettype(), args[0], oa_prompter)) if(!cryptonote::get_account_address_from_str_or_url(info, m_wallet->nettype(), args[0], oa_prompter))