diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp --- a/src/interfaces/wallet.cpp +++ b/src/interfaces/wallet.cpp @@ -232,9 +232,8 @@ WalletOrderForm order_form) override { auto locked_chain = m_wallet->chain().lock(); LOCK(m_wallet->cs_wallet); - TxValidationState state; m_wallet->CommitTransaction(std::move(tx), std::move(value_map), - std::move(order_form), state); + std::move(order_form)); } bool transactionCanBeAbandoned(const TxId &txid) override { return m_wallet->TransactionCanBeAbandoned(txid); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -374,9 +374,7 @@ } throw JSONRPCError(RPC_WALLET_ERROR, strError); } - TxValidationState state; - pwallet->CommitTransaction(tx, std::move(mapValue), {} /* orderForm */, - state); + pwallet->CommitTransaction(tx, std::move(mapValue), {} /* orderForm */); return tx; } @@ -1058,9 +1056,7 @@ if (!fCreated) { throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, strFailReason); } - TxValidationState state; - pwallet->CommitTransaction(tx, std::move(mapValue), {} /* orderForm */, - state); + pwallet->CommitTransaction(tx, std::move(mapValue), {} /* orderForm */); return tx->GetId().GetHex(); } diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include @@ -486,8 +485,7 @@ BOOST_CHECK(wallet->CreateTransaction( *locked_chain, {recipient}, tx, fee, changePos, error, dummy)); } - TxValidationState state; - wallet->CommitTransaction(tx, {}, {}, state); + wallet->CommitTransaction(tx, {}, {}); CMutableTransaction blocktx; { LOCK(wallet->cs_wallet); diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1349,13 +1349,10 @@ * @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] TxValidationState object returning information about - * whether the transaction was accepted */ void CommitTransaction( CTransactionRef tx, mapValue_t mapValue, - std::vector> orderForm, - TxValidationState &state); + std::vector> orderForm); bool DummySignTx(CMutableTransaction &txNew, const std::set &txouts, bool use_max_sig = false) const { diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3666,8 +3666,7 @@ void CWallet::CommitTransaction( CTransactionRef tx, mapValue_t mapValue, - std::vector> orderForm, - TxValidationState &state) { + std::vector> orderForm) { auto locked_chain = chain().lock(); LOCK(cs_wallet);