diff options
| author | fanquake <fanquake@gmail.com> | 2019-10-20 18:33:07 -0400 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2019-10-20 19:50:20 -0400 |
| commit | 0d7e8d66c45c55f2335660940173334e62c1133e (patch) | |
| tree | aacc8332f9a6b871f438b9715cc88d4debc60c21 | |
| parent | b8f041af2d2c89afdc14f8c632dfb7fecb535cb5 (diff) | |
| parent | 7ca68e1461376afc22a26268c80a7281522ed9eb (diff) | |
| download | bitcoin-0d7e8d66c45c55f2335660940173334e62c1133e.tar.xz | |
Merge #17203: wallet: Remove unused GetLabelName
7ca68e1461376afc22a26268c80a7281522ed9eb wallet: Remove unused GetLabelName (Sebastian Falbesoner)
Pull request description:
While taking a look at #17198 I noticed that the method `CWallet::GetLabelName(...)` is not used anymore, since the `account` API was removed (c9c32e6b844fc79467b7e24c6c916142a0d08484).
ACKs for top commit:
practicalswift:
ACK 7ca68e1461376afc22a26268c80a7281522ed9eb
promag:
ACK 7ca68e1461376afc22a26268c80a7281522ed9eb.
fanquake:
ACK 7ca68e1461376afc22a26268c80a7281522ed9eb
Tree-SHA512: 6825d77a85934e2368a3fb44c8db0ed0872aa5606e3761decb0a6b7e3773277afa7021bf1f71009207c3961cdd0a1c448854ea2fd8be95c3afec466254faf82d
| -rw-r--r-- | src/wallet/wallet.cpp | 15 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 2 |
2 files changed, 0 insertions, 17 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index ca1f16f692..4a97e41976 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3468,21 +3468,6 @@ bool CWallet::DelAddressBook(const CTxDestination& address) return WalletBatch(*database).EraseName(EncodeDestination(address)); } -const std::string& CWallet::GetLabelName(const CScript& scriptPubKey) const -{ - CTxDestination address; - if (ExtractDestination(scriptPubKey, address) && !scriptPubKey.IsUnspendable()) { - auto mi = mapAddressBook.find(address); - if (mi != mapAddressBook.end()) { - return mi->second.name; - } - } - // A scriptPubKey that doesn't have an entry in the address book is - // associated with the default label (""). - const static std::string DEFAULT_LABEL_NAME; - return DEFAULT_LABEL_NAME; -} - /** * Mark old keypool keys as used, * and generate all new keys diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 62641fceec..a1517a9db5 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1245,8 +1245,6 @@ public: bool DelAddressBook(const CTxDestination& address); - const std::string& GetLabelName(const CScript& scriptPubKey) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); - unsigned int GetKeyPoolSize() EXCLUSIVE_LOCKS_REQUIRED(cs_wallet) { AssertLockHeld(cs_wallet); |