diff options
| author | Pieter Wuille <[email protected]> | 2016-05-16 22:47:29 +0200 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2016-05-16 22:55:58 +0200 |
| commit | b3e42b6d02e8d19658a9135e427ebceab5367779 (patch) | |
| tree | 29d9f99f470ad78cd2da6ce4673a6837642336ab /src/wallet/wallet.cpp | |
| parent | Merge #8046: [Qt][OSX] Fix Cmd-Q / Menu Quit shutdown on OSX (diff) | |
| parent | Remove unneeded feerate param from RelayTransaction/AcceptToMemoryPool. (diff) | |
| download | discoin-b3e42b6d02e8d19658a9135e427ebceab5367779.tar.xz discoin-b3e42b6d02e8d19658a9135e427ebceab5367779.zip | |
Merge #8059: Remove unneeded feerate param from RelayTransaction/AcceptToMemoryPool.
d87b198 Remove unneeded feerate param from RelayTransaction/AcceptToMemoryPool. (Gregory Maxwell)
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index a18b669b3..6b942e29d 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1272,9 +1272,7 @@ bool CWalletTx::RelayWalletTransaction() { if (GetDepthInMainChain() == 0 && !isAbandoned() && InMempool()) { LogPrintf("Relaying wtx %s\n", GetHash().ToString()); - CFeeRate feeRate; - mempool.lookupFeeRate(GetHash(), feeRate); - RelayTransaction((CTransaction)*this, feeRate); + RelayTransaction((CTransaction)*this); return true; } } @@ -3331,5 +3329,5 @@ int CMerkleTx::GetBlocksToMaturity() const bool CMerkleTx::AcceptToMemoryPool(bool fLimitFree, CAmount nAbsurdFee) { CValidationState state; - return ::AcceptToMemoryPool(mempool, state, *this, fLimitFree, NULL, NULL, false, nAbsurdFee); + return ::AcceptToMemoryPool(mempool, state, *this, fLimitFree, NULL, false, nAbsurdFee); } |