diff options
| author | MarcoFalke <[email protected]> | 2016-08-25 15:28:11 +0200 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2016-08-25 15:27:48 +0200 |
| commit | fa28bfa341b0f1ca53ae2fc8d3d08afbf8d69a61 (patch) | |
| tree | 07176776b32d46efaecd07ada06da275fdf9bd40 /src/wallet/wallet.cpp | |
| parent | Merge #8261: The bit field is shown only when status is "started" (diff) | |
| download | discoin-fa28bfa341b0f1ca53ae2fc8d3d08afbf8d69a61.tar.xz discoin-fa28bfa341b0f1ca53ae2fc8d3d08afbf8d69a61.zip | |
[wallet] Set fLimitFree = true
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 87b85eeb7..3275ac2ef 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1405,7 +1405,7 @@ void CWallet::ReacceptWalletTransactions() CWalletTx& wtx = *(item.second); LOCK(mempool.cs); - wtx.AcceptToMemoryPool(false, maxTxFee); + wtx.AcceptToMemoryPool(maxTxFee); } } @@ -2450,8 +2450,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey) if (fBroadcastTransactions) { // Broadcast - if (!wtxNew.AcceptToMemoryPool(false, maxTxFee)) - { + if (!wtxNew.AcceptToMemoryPool(maxTxFee)) { // This must not fail. The transaction has already been signed and recorded. LogPrintf("CommitTransaction(): Error: Transaction not valid\n"); return false; @@ -3563,8 +3562,8 @@ int CMerkleTx::GetBlocksToMaturity() const } -bool CMerkleTx::AcceptToMemoryPool(bool fLimitFree, CAmount nAbsurdFee) +bool CMerkleTx::AcceptToMemoryPool(const CAmount& nAbsurdFee) { CValidationState state; - return ::AcceptToMemoryPool(mempool, state, *this, fLimitFree, NULL, false, nAbsurdFee); + return ::AcceptToMemoryPool(mempool, state, *this, true, NULL, false, nAbsurdFee); } |