aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet.cpp
diff options
context:
space:
mode:
authorGregory Maxwell <greg@xiph.org>2016-04-20 19:38:19 +0000
committerGregory Maxwell <greg@xiph.org>2016-05-16 04:10:06 +0000
commitd87b198b7334317952ca6a1377e25b5c859a1767 (patch)
tree29d9f99f470ad78cd2da6ce4673a6837642336ab /src/wallet/wallet.cpp
parent169d379c98357a17e634f34b5e72033c69f9a7cb (diff)
downloadbitcoin-d87b198b7334317952ca6a1377e25b5c859a1767.tar.xz
Remove unneeded feerate param from RelayTransaction/AcceptToMemoryPool.
Diffstat (limited to 'src/wallet/wallet.cpp')
-rw-r--r--src/wallet/wallet.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index a18b669b32..6b942e29d7 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);
}