diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-08-30 16:08:56 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-08-30 16:18:36 +0200 |
| commit | 07033a8f91975028e366920b0da3f7e2a6ef9cbd (patch) | |
| tree | 512944b5c68f65135df8d2b76f319878d47e92db /src/interfaces | |
| parent | 6c7cfc8da68a6a68fb83b65d3a456eec8554d1e9 (diff) | |
| parent | c9c32e6b844fc79467b7e24c6c916142a0d08484 (diff) | |
| download | bitcoin-07033a8f91975028e366920b0da3f7e2a6ef9cbd.tar.xz | |
Merge #13825: [wallet] Kill accounts
c9c32e6b844fc79467b7e24c6c916142a0d08484 [wallet] Kill accounts (John Newbery)
Tree-SHA512: 783272e7df9042fb0a01826fa37a02b97218496459015d7457e56223da8690bdad930c223dd4a903a1d4df57f3f2f4a097d392d272a72419ea9a882b11e599f7
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/wallet.cpp | 3 | ||||
| -rw-r--r-- | src/interfaces/wallet.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp index 01467f3a1c..566ae37509 100644 --- a/src/interfaces/wallet.cpp +++ b/src/interfaces/wallet.cpp @@ -39,12 +39,11 @@ public: bool commit(WalletValueMap value_map, WalletOrderForm order_form, - std::string from_account, std::string& reject_reason) override { LOCK2(cs_main, m_wallet.cs_wallet); CValidationState state; - if (!m_wallet.CommitTransaction(m_tx, std::move(value_map), std::move(order_form), std::move(from_account), m_key, g_connman.get(), state)) { + if (!m_wallet.CommitTransaction(m_tx, std::move(value_map), std::move(order_form), m_key, g_connman.get(), state)) { reject_reason = state.GetRejectReason(); return false; } diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h index ae54d42442..44240a5726 100644 --- a/src/interfaces/wallet.h +++ b/src/interfaces/wallet.h @@ -289,7 +289,6 @@ public: //! Send pending transaction and commit to wallet. virtual bool commit(WalletValueMap value_map, WalletOrderForm order_form, - std::string from_account, std::string& reject_reason) = 0; }; |