From d1734f9a3b138ab046f38ee44a09bc3847bf938a Mon Sep 17 00:00:00 2001 From: John Newbery Date: Wed, 3 Apr 2019 17:55:24 -0400 Subject: [wallet] Remove return value from CommitTransaction() CommitTransaction returns a bool to indicate success, but since commit b3a74100b8 it only returns true, even if the transaction was not successfully broadcast. This commit changes CommitTransaction() to return void. All dead code in `if (!CommitTransaction())` branches has been removed. --- src/interfaces/wallet.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/interfaces/wallet.cpp') diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp index aff08bfbe..1830de8a2 100644 --- a/src/interfaces/wallet.cpp +++ b/src/interfaces/wallet.cpp @@ -218,19 +218,14 @@ public: } return tx; } - bool commitTransaction(CTransactionRef tx, + void commitTransaction(CTransactionRef tx, WalletValueMap value_map, - WalletOrderForm order_form, - std::string& reject_reason) override + WalletOrderForm order_form) override { auto locked_chain = m_wallet->chain().lock(); LOCK(m_wallet->cs_wallet); CValidationState state; - if (!m_wallet->CommitTransaction(std::move(tx), std::move(value_map), std::move(order_form), state)) { - reject_reason = state.GetRejectReason(); - return false; - } - return true; + m_wallet->CommitTransaction(std::move(tx), std::move(value_map), std::move(order_form), state); } bool transactionCanBeAbandoned(const uint256& txid) override { return m_wallet->TransactionCanBeAbandoned(txid); } bool abandonTransaction(const uint256& txid) override -- cgit v1.2.3 From 9e95931865186d7a9a6dc54b64bd96507e9fea4b Mon Sep 17 00:00:00 2001 From: John Newbery Date: Fri, 18 Oct 2019 09:37:40 -0400 Subject: [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). --- src/interfaces/wallet.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/interfaces/wallet.cpp') diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp index 1830de8a2..530f19e2d 100644 --- a/src/interfaces/wallet.cpp +++ b/src/interfaces/wallet.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include #include @@ -224,8 +223,7 @@ public: { 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 -- cgit v1.2.3