Merge pull request #1599

17246d0 wallet: print exception message on get_random_outs_error (moneromooo-monero)
monero-project · Jan 21, 2017 · 39aaea8 · 39aaea8
2 parents 96a35cd + 17246d0
commit 39aaea8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
@@ -2317,9 +2317,9 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
     LOG_ERROR("RPC error: " << e.to_string());
     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)
   {
@@ -2495,9 +2495,9 @@ bool simple_wallet::sweep_unmixable(const std::vector<std::string> &args_)
     LOG_ERROR("RPC error: " << e.to_string());
     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)
   {
@@ -2756,9 +2756,9 @@ bool simple_wallet::sweep_all(const std::vector<std::string> &args_)
     LOG_ERROR("RPC error: " << e.to_string());
     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)
   {
@@ -3041,9 +3041,9 @@ bool simple_wallet::submit_transfer(const std::vector<std::string> &args_)
     LOG_ERROR("Unknown RPC error: " << e.to_string());
     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)
   {

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