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/rpc/rawtransaction.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/rpc/rawtransaction.cpp')
| -rw-r--r-- | src/rpc/rawtransaction.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index de8cd68f6..bec7ebe55 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -819,12 +819,11 @@ UniValue sendrawtransaction(const UniValue& params, bool fHelp) const CCoins* existingCoins = view.AccessCoins(hashTx); bool fHaveMempool = mempool.exists(hashTx); bool fHaveChain = existingCoins && existingCoins->nHeight < 1000000000; - CFeeRate txFeeRate = CFeeRate(0); if (!fHaveMempool && !fHaveChain) { // push to local node and sync with wallets CValidationState state; bool fMissingInputs; - if (!AcceptToMemoryPool(mempool, state, tx, false, &fMissingInputs, &txFeeRate, false, nMaxRawTxFee)) { + if (!AcceptToMemoryPool(mempool, state, tx, false, &fMissingInputs, false, nMaxRawTxFee)) { if (state.IsInvalid()) { throw JSONRPCError(RPC_TRANSACTION_REJECTED, strprintf("%i: %s", state.GetRejectCode(), state.GetRejectReason())); } else { @@ -837,7 +836,7 @@ UniValue sendrawtransaction(const UniValue& params, bool fHelp) } else if (fHaveChain) { throw JSONRPCError(RPC_TRANSACTION_ALREADY_IN_CHAIN, "transaction already in block chain"); } - RelayTransaction(tx, txFeeRate); + RelayTransaction(tx); return hashTx.GetHex(); } |