aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorRussell Yanofsky <russ@yanofsky.org>2017-11-20 12:52:47 -0500
committerRussell Yanofsky <russ@yanofsky.org>2020-05-01 05:59:09 -0500
commit28b112e9bd3fd1181c0720306051ba7efca8b436 (patch)
treef492ede76f4813985b7c219b74c73e6475895c50 /src/wallet
parentd002f9d15d938e78360ad906f2d74a249c7e923e (diff)
Get rid of BindWallet
CWalletTx initialization has been fixed so it's no longer necessary to change which wallet a transaction is bound to.
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/wallet.cpp3
-rw-r--r--src/wallet/wallet.h6
2 files changed, 1 insertions, 8 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 36f00b8959..5b489749bf 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 932e1a28b8..c681b84750 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;