aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-03-21 10:12:12 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-03-21 10:12:23 +0000
commitf7301c3563e7ae19b8d7c65d8bc88f3c42eefc09 (patch)
tree18d3ab32dfd303b6256c0571cfd9d893db858531 /src/wallet
parentMerge pull request #738 (diff)
downloadmonero-f7301c3563e7ae19b8d7c65d8bc88f3c42eefc09.tar.xz
Revert "Print stack trace upon exceptions"
Ain't nobody got time for link/cmake skullduggery. This reverts commit fff238ec94ac6d45fc18c315d7bc590ddfaad63d.
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/wallet2.cpp5
-rw-r--r--src/wallet/wallet2.h1
-rw-r--r--src/wallet/wallet2_api.cpp1
3 files changed, 2 insertions, 5 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index ef17a770b..2afe08cb1 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -32,7 +32,6 @@
#include <boost/archive/binary_iarchive.hpp>
#include <boost/utility/value_init.hpp>
-#include "common/exception.h"
#include "include_base_utils.h"
using namespace epee;
@@ -804,7 +803,7 @@ void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& re
// handle error from async fetching thread
if (error)
{
- throw tools::runtime_error("proxy exception in refresh thread");
+ throw std::runtime_error("proxy exception in refresh thread");
}
}
catch (const std::exception&)
@@ -2013,7 +2012,7 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions(std::vector<crypto
// Throw if split_amounts comes back with a vector of size different than it should
if (split_values.size() != num_tx)
{
- throw tools::runtime_error("Splitting transactions returned a number of potential tx not equal to what was requested");
+ throw std::runtime_error("Splitting transactions returned a number of potential tx not equal to what was requested");
}
std::vector<pending_tx> ptx_vector;
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 0961ad981..f798f404d 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -35,7 +35,6 @@
#include <boost/serialization/vector.hpp>
#include <atomic>
-#include "common/exception.h"
#include "include_base_utils.h"
#include "cryptonote_core/account.h"
#include "cryptonote_core/account_boost_serialization.h"
diff --git a/src/wallet/wallet2_api.cpp b/src/wallet/wallet2_api.cpp
index 0cb253398..0644e3690 100644
--- a/src/wallet/wallet2_api.cpp
+++ b/src/wallet/wallet2_api.cpp
@@ -28,7 +28,6 @@
//
// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
-#include "common/exception.h"
#include "wallet2_api.h"
#include "wallet2.h"
#include "mnemonics/electrum-words.h"