aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-02-16 14:22:41 +0100
committerRiccardo Spagni <ric@spagni.net>2018-02-16 14:22:41 +0100
commit9c4428e583cdbcbab42c3ce14903e7cc636fe515 (patch)
treede29a289d666befdb2b9136d056810e5f3d3b119
parentMerge pull request #3210 (diff)
parentwallet: suggest the use of sweep_unmixable when not_enough_outs_to_mix is thrown (diff)
downloadmonero-9c4428e583cdbcbab42c3ce14903e7cc636fe515.tar.xz
Merge pull request #3214
214d251c wallet: suggest the use of sweep_unmixable when not_enough_outs_to_mix is thrown (stoffu)
-rw-r--r--src/simplewallet/simplewallet.cpp1
-rw-r--r--src/wallet/api/wallet.cpp1
-rw-r--r--src/wallet/wallet_rpc_server.cpp2
3 files changed, 3 insertions, 1 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 0a57dec80..4ad1b83ec 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -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 << tr("Please use sweep_unmixable.");
}
catch (const tools::error::tx_not_constructed&)
{
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index f648160c9..5ce8ede8d 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -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()) {
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_status = Status_Error;
} catch (const tools::error::tx_not_constructed&) {
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index b71e28b2d..5c644983b 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -2442,7 +2442,7 @@ namespace tools
catch (const tools::error::not_enough_outs_to_mix& e)
{
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)
{