From 28b112e9bd3fd1181c0720306051ba7efca8b436 Mon Sep 17 00:00:00 2001 From: Russell Yanofsky Date: Mon, 20 Nov 2017 12:52:47 -0500 Subject: [PATCH] Get rid of BindWallet CWalletTx initialization has been fixed so it's no longer necessary to change which wallet a transaction is bound to. --- src/wallet/wallet.cpp | 3 +-- src/wallet/wallet.h | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 36f00b89595..5b489749bf2 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -806,7 +806,6 @@ CWalletTx* CWallet::AddToWallet(CTransactionRef tx, const CWalletTx::Confirmatio // Inserts only if not already there, returns tx inserted or tx found auto ret = mapWallet.emplace(std::piecewise_construct, std::forward_as_tuple(hash), std::forward_as_tuple(this, tx)); CWalletTx& wtx = (*ret.first).second; - wtx.BindWallet(this); bool fInsertedNew = ret.second; bool fUpdated = update_wtx && update_wtx(wtx, fInsertedNew); if (fInsertedNew) { @@ -3018,7 +3017,7 @@ void CWallet::CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::ve // Notify that old coins are spent for (const CTxIn& txin : tx->vin) { CWalletTx &coin = mapWallet.at(txin.prevout.hash); - coin.BindWallet(this); + coin.MarkDirty(); NotifyTransactionChanged(this, coin.GetHash(), CT_UPDATED); } diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 932e1a28b87..c681b847500 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -463,12 +463,6 @@ public: m_is_cache_empty = true; } - void BindWallet(CWallet *pwalletIn) - { - pwallet = pwalletIn; - MarkDirty(); - } - //! filter decides which addresses will count towards the debit CAmount GetDebit(const isminefilter& filter) const; CAmount GetCredit(const isminefilter& filter) const;