monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 16:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2750

Browse source 
424852a6 Fix 'sweep_all' command when called with no args (Leon Klingele)
This commit is contained in:
Riccardo Spagni 2017-11-14 15:49:15 +02:00
commit 95c34e17cd
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/simplewallet/simplewallet.cpp
View file

@ -3173,6 +3173,12 @@ bool simple_wallet::sweep_unmixable(const std::vector<std::string> &args_)
bool simple_wallet::sweep_main(uint64_t below, const std::vector<std::string> &args_) bool simple_wallet::sweep_main(uint64_t below, const std::vector<std::string> &args_)
{ {
// sweep_all [index=<N1>[,<N2>,...]] [<ring_size>] <address> [<payment_id>] // sweep_all [index=<N1>[,<N2>,...]] [<ring_size>] <address> [<payment_id>]
if (args_.size() == 0)
{
fail_msg_writer() << tr("No address given");
return true;
}
if (m_wallet->ask_password() && !get_and_verify_password()) { return true; } if (m_wallet->ask_password() && !get_and_verify_password()) { return true; }
if (!try_connect_to_daemon()) if (!try_connect_to_daemon())
return true; return true;
@ -3255,12 +3261,6 @@ bool simple_wallet::sweep_main(uint64_t below, const std::vector<std::string> &a
local_args.pop_back(); local_args.pop_back();
} }
if (local_args.size() == 0)
{
fail_msg_writer() << tr("No address given");
return true;
}
cryptonote::address_parse_info info; cryptonote::address_parse_info info;
if (!cryptonote::get_account_address_from_str_or_url(info, m_wallet->testnet(), local_args[0], oa_prompter)) if (!cryptonote::get_account_address_from_str_or_url(info, m_wallet->testnet(), local_args[0], oa_prompter))
{ {