[wallet] Remove state argument from CWallet::CommitTransaction

The `state` return argument has not been set since commit 611291c. Remove it (and the one place that it's used in a calling function).
vijaydasmp · Oct 18, 2019 · 9e95931 · 9e95931
1 parent d1734f9
commit 9e95931
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 24 deletions.
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp
@@ -5,7 +5,6 @@
 #include <interfaces/wallet.h>
 
 #include <amount.h>
-#include <consensus/validation.h>
 #include <interfaces/chain.h>
 #include <interfaces/handler.h>
 #include <policy/feerate.h>
@@ -224,8 +223,7 @@ class WalletImpl : public Wallet
  {
  auto locked_chain = m_wallet->chain().lock();
  LOCK(m_wallet->cs_wallet);
- CValidationState state;
- m_wallet->CommitTransaction(std::move(tx), std::move(value_map), std::move(order_form), state);
+ m_wallet->CommitTransaction(std::move(tx), std::move(value_map), std::move(order_form));
  }
  bool transactionCanBeAbandoned(const uint256& txid) override { return m_wallet->TransactionCanBeAbandoned(txid); }
  bool abandonTransaction(const uint256& txid) override

diff --git 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

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -4,7 +4,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <amount.h>
-#include <consensus/validation.h>
 #include <core_io.h>
 #include <init.h>
 #include <interfaces/chain.h>
@@ -342,8 +341,7 @@ static CTransactionRef SendMoney(interfaces::Chain::Lock& locked_chain, CWallet
  strError = strprintf("Error: This transaction requires a transaction fee of at least %s", FormatMoney(nFeeRequired));
  throw JSONRPCError(RPC_WALLET_ERROR, strError);
  }
- CValidationState state;
- pwallet->CommitTransaction(tx, std::move(mapValue), {} /* orderForm */, state);
+ pwallet->CommitTransaction(tx, std::move(mapValue), {} /* orderForm */);
  return tx;
 }
 
@@ -924,8 +922,7 @@ static UniValue sendmany(const JSONRPCRequest& request)
  bool fCreated = pwallet->CreateTransaction(*locked_chain, vecSend, tx, nFeeRequired, nChangePosRet, strFailReason, coin_control);
  if (!fCreated)
  throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, strFailReason);
- CValidationState state;
- pwallet->CommitTransaction(tx, std::move(mapValue), {} /* orderForm */, state);
+ pwallet->CommitTransaction(tx, std::move(mapValue), {} /* orderForm */);
  return tx->GetHash().GetHex();
 }
 

diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
@@ -8,7 +8,6 @@
 #include <stdint.h>
 #include <vector>
 
-#include <consensus/validation.h>
 #include <interfaces/chain.h>
 #include <policy/policy.h>
 #include <rpc/server.h>
@@ -451,8 +450,7 @@ class ListCoinsTestingSetup : public TestChain100Setup
  auto locked_chain = m_chain->lock();
  BOOST_CHECK(wallet->CreateTransaction(*locked_chain, {recipient}, tx, fee, changePos, error, dummy));
  }
- CValidationState state;
- wallet->CommitTransaction(tx, {}, {}, state);
+ wallet->CommitTransaction(tx, {}, {});
  CMutableTransaction blocktx;
  {
  LOCK(wallet->cs_wallet);

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3286,7 +3286,7 @@ bool CWallet::CreateTransaction(interfaces::Chain::Lock& locked_chain, const std
  return true;
 }
 
-void CWallet::CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::vector<std::pair<std::string, std::string>> orderForm, CValidationState& state)
+void CWallet::CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::vector<std::pair<std::string, std::string>> orderForm)
 {
  auto locked_chain = chain().lock();
  LOCK(cs_wallet);

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -1155,9 +1155,8 @@ class CWallet final : public FillableSigningProvider, private interfaces::Chain:
  * @param tx[in] The transaction to be broadcast.
  * @param mapValue[in] key-values to be set on the transaction.
  * @param orderForm[in] BIP 70 / BIP 21 order form details to be set on the transaction.
- * @param state[in,out] CValidationState object returning information about whether the transaction was accepted
  */
- void CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::vector<std::pair<std::string, std::string>> orderForm, CValidationState& state);
+ void CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::vector<std::pair<std::string, std::string>> orderForm);
 
  bool DummySignTx(CMutableTransaction &txNew, const std::set<CTxOut> &txouts, bool use_max_sig = false) const
  {