rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-27 13:23:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1599

Browse Source 
17246d05 wallet: print exception message on get_random_outs_error (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-01-20 21:00:01 -05:00
commit 39aaea8e62
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/simplewallet/simplewallet.cpp
View File

@ -2317,9 +2317,9 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
LOG_ERROR("RPC error: " << e.to_string()); LOG_ERROR("RPC error: " << e.to_string());
fail_msg_writer() << tr("RPC error: ") << e.what(); fail_msg_writer() << tr("RPC error: ") << e.what();
} }
catch (const tools::error::get_random_outs_error&) catch (const tools::error::get_random_outs_error &e)
{ {
fail_msg_writer() << tr("failed to get random outputs to mix"); fail_msg_writer() << tr("failed to get random outputs to mix: ") << e.what();
} }
catch (const tools::error::not_enough_money& e) catch (const tools::error::not_enough_money& e)
{ {
@ -2495,9 +2495,9 @@ bool simple_wallet::sweep_unmixable(const std::vector<std::string> &args_)
LOG_ERROR("RPC error: " << e.to_string()); LOG_ERROR("RPC error: " << e.to_string());
fail_msg_writer() << tr("RPC error: ") << e.what(); fail_msg_writer() << tr("RPC error: ") << e.what();
} }
catch (const tools::error::get_random_outs_error&) catch (const tools::error::get_random_outs_error &e)
{ {
fail_msg_writer() << tr("failed to get random outputs to mix"); fail_msg_writer() << tr("failed to get random outputs to mix: ") << e.what();
} }
catch (const tools::error::not_enough_money& e) catch (const tools::error::not_enough_money& e)
{ {
@ -2756,9 +2756,9 @@ bool simple_wallet::sweep_all(const std::vector<std::string> &args_)
LOG_ERROR("RPC error: " << e.to_string()); LOG_ERROR("RPC error: " << e.to_string());
fail_msg_writer() << tr("RPC error: ") << e.what(); fail_msg_writer() << tr("RPC error: ") << e.what();
} }
catch (const tools::error::get_random_outs_error&) catch (const tools::error::get_random_outs_error &e)
{ {
fail_msg_writer() << tr("failed to get random outputs to mix"); fail_msg_writer() << tr("failed to get random outputs to mix: ") << e.what();
} }
catch (const tools::error::not_enough_money& e) catch (const tools::error::not_enough_money& e)
{ {
@ -3041,9 +3041,9 @@ bool simple_wallet::submit_transfer(const std::vector<std::string> &args_)
LOG_ERROR("Unknown RPC error: " << e.to_string()); LOG_ERROR("Unknown RPC error: " << e.to_string());
fail_msg_writer() << tr("RPC error: ") << e.what(); fail_msg_writer() << tr("RPC error: ") << e.what();
} }
catch (const tools::error::get_random_outs_error&) catch (const tools::error::get_random_outs_error &e)
{ {
fail_msg_writer() << tr("failed to get random outputs to mix"); fail_msg_writer() << tr("failed to get random outputs to mix: ") << e.what();
} }
catch (const tools::error::not_enough_money& e) catch (const tools::error::not_enough_money& e)
{ {

4
src/wallet/api/wallet.cpp
View File

@ -834,8 +834,8 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const
} catch (const tools::error::wallet_rpc_error& e) { } catch (const tools::error::wallet_rpc_error& e) {
m_errorString = tr("RPC error: ") + e.to_string(); m_errorString = tr("RPC error: ") + e.to_string();
m_status = Status_Error; m_status = Status_Error;
} catch (const tools::error::get_random_outs_error&) { } catch (const tools::error::get_random_outs_error &e) {
m_errorString = tr("failed to get random outputs to mix"); m_errorString = (boost::format(tr("failed to get random outputs to mix: %s")) % e.what()).str();
m_status = Status_Error; m_status = Status_Error;
} catch (const tools::error::not_enough_money& e) { } catch (const tools::error::not_enough_money& e) {