aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-12-14 12:30:08 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2013-12-14 12:30:08 +0100
commitca2c83da50a2665f238432834c0246f52b5e234c (patch)
treed215772a66e3a452612181e5e5e650c2cd7b76e9 /src/wallet.cpp
parent37e67d37c14e916e901f9b7fac74b97150b1fe2b (diff)
downloadbitcoin-ca2c83da50a2665f238432834c0246f52b5e234c.tar.xz
Remove unused ThreadSafeAskFee from ui_interface
ThreadSafeAskFee is effectively unused. It is only called when the fAskFee parameter on SendMoney or SendMoneyToDestination is true, which never happens. Remove it.
Diffstat (limited to 'src/wallet.cpp')
-rw-r--r--src/wallet.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 241e937b1b..3c3d890e2e 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -1434,7 +1434,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
-string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew, bool fAskFee)
+string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew)
{
CReserveKey reservekey(this);
int64_t nFeeRequired;
@@ -1454,9 +1454,6 @@ string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNe
return strError;
}
- if (fAskFee && !uiInterface.ThreadSafeAskFee(nFeeRequired))
- return "ABORTED";
-
if (!CommitTransaction(wtxNew, reservekey))
return _("Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.");
@@ -1465,7 +1462,7 @@ string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNe
-string CWallet::SendMoneyToDestination(const CTxDestination& address, int64_t nValue, CWalletTx& wtxNew, bool fAskFee)
+string CWallet::SendMoneyToDestination(const CTxDestination& address, int64_t nValue, CWalletTx& wtxNew)
{
// Check amount
if (nValue <= 0)
@@ -1477,7 +1474,7 @@ string CWallet::SendMoneyToDestination(const CTxDestination& address, int64_t nV
CScript scriptPubKey;
scriptPubKey.SetDestination(address);
- return SendMoney(scriptPubKey, nValue, wtxNew, fAskFee);
+ return SendMoney(scriptPubKey, nValue, wtxNew);
}