aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/feebumper.cpp
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2019-10-18 09:37:40 -0400
committerJohn Newbery <john@johnnewbery.com>2019-10-18 09:43:01 -0400
commit9e95931865186d7a9a6dc54b64bd96507e9fea4b (patch)
treec6cf3fe27d4cdd98a358592fb880703605a87cf7 /src/wallet/feebumper.cpp
parentd1734f9a3b138ab046f38ee44a09bc3847bf938a (diff)
downloadbitcoin-9e95931865186d7a9a6dc54b64bd96507e9fea4b.tar.xz
[wallet] Remove `state` argument from CWallet::CommitTransaction
The `state` return argument has not been set since commit 611291c198. Remove it (and the one place that it's used in a calling function).
Diffstat (limited to 'src/wallet/feebumper.cpp')
-rw-r--r--src/wallet/feebumper.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp
index c9cd042b03..0a4bb3f396 100644
--- a/src/wallet/feebumper.cpp
+++ b/src/wallet/feebumper.cpp
@@ -2,7 +2,6 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#include <consensus/validation.h>
#include <interfaces/chain.h>
#include <wallet/coincontrol.h>
#include <wallet/feebumper.h>
@@ -393,17 +392,10 @@ Result CommitTransaction(CWallet& wallet, const uint256& txid, CMutableTransacti
mapValue_t mapValue = oldWtx.mapValue;
mapValue["replaces_txid"] = oldWtx.GetHash().ToString();
- CValidationState state;
- wallet.CommitTransaction(tx, std::move(mapValue), oldWtx.vOrderForm, state);
-
- bumped_txid = tx->GetHash();
- if (state.IsInvalid()) {
- // This can happen if the mempool rejected the transaction. Report
- // what happened in the "errors" response.
- errors.push_back(strprintf("Error: The transaction was rejected: %s", FormatStateMessage(state)));
- }
+ wallet.CommitTransaction(tx, std::move(mapValue), oldWtx.vOrderForm);
// mark the original tx as bumped
+ bumped_txid = tx->GetHash();
if (!wallet.MarkReplaced(oldWtx.GetHash(), bumped_txid)) {
// TODO: see if JSON-RPC has a standard way of returning a response
// along with an exception. It would be good to return information about