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

Merge pull request #3214

Browse source 
214d251c wallet: suggest the use of sweep_unmixable when not_enough_outs_to_mix is thrown (stoffu)
This commit is contained in:
Riccardo Spagni 2018-02-16 14:22:41 +01:00
commit 9c4428e583
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/simplewallet/simplewallet.cpp
View file

@ -397,6 +397,7 @@ namespace
{ {
writer << "\n" << tr("output amount") << " = " << print_money(outs_for_amount.first) << ", " << tr("found outputs to use") << " = " << outs_for_amount.second; writer << "\n" << tr("output amount") << " = " << print_money(outs_for_amount.first) << ", " << tr("found outputs to use") << " = " << outs_for_amount.second;
} }
writer << tr("Please use sweep_unmixable.");
} }
catch (const tools::error::tx_not_constructed&) catch (const tools::error::tx_not_constructed&)
{ {

1
src/wallet/api/wallet.cpp
View file

@ -1198,6 +1198,7 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const
for (const std::pair<uint64_t, uint64_t> outs_for_amount : e.scanty_outs()) { for (const std::pair<uint64_t, uint64_t> outs_for_amount : e.scanty_outs()) {
writer << "\n" << tr("output amount") << " = " << print_money(outs_for_amount.first) << ", " << tr("found outputs to use") << " = " << outs_for_amount.second; writer << "\n" << tr("output amount") << " = " << print_money(outs_for_amount.first) << ", " << tr("found outputs to use") << " = " << outs_for_amount.second;
} }
writer << "\n" << tr("Please sweep unmixable outputs.");
m_errorString = writer.str(); m_errorString = writer.str();
m_status = Status_Error; m_status = Status_Error;
} catch (const tools::error::tx_not_constructed&) { } catch (const tools::error::tx_not_constructed&) {

2
src/wallet/wallet_rpc_server.cpp
View file

@ -2442,7 +2442,7 @@ namespace tools
catch (const tools::error::not_enough_outs_to_mix& e) catch (const tools::error::not_enough_outs_to_mix& e)
{ {
er.code = WALLET_RPC_ERROR_CODE_NOT_ENOUGH_OUTS_TO_MIX; er.code = WALLET_RPC_ERROR_CODE_NOT_ENOUGH_OUTS_TO_MIX;
er.message = e.what(); er.message = e.what() + std::string(" Please use sweep_dust.");
} }
catch (const error::file_exists& e) catch (const error::file_exists& e)
{ {