Skip to content

Commit 2b48642

Browse files
committed
refactor: use ForEachAddrBookEntry in interfaces::getAddresses
1 parent 032842a commit 2b48642

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/interfaces/wallet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class Wallet
114114
std::string* purpose) = 0;
115115

116116
//! Get wallet address list.
117-
virtual std::vector<WalletAddress> getAddresses() = 0;
117+
virtual std::vector<WalletAddress> getAddresses() const = 0;
118118

119119
//! Get receive requests.
120120
virtual std::vector<std::string> getAddressReceiveRequests() = 0;

src/wallet/interfaces.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,14 +204,14 @@ class WalletImpl : public Wallet
204204
}
205205
return true;
206206
}
207-
std::vector<WalletAddress> getAddresses() override
207+
std::vector<WalletAddress> getAddresses() const override
208208
{
209209
LOCK(m_wallet->cs_wallet);
210210
std::vector<WalletAddress> result;
211-
for (const auto& item : m_wallet->m_address_book) {
212-
if (item.second.IsChange()) continue;
213-
result.emplace_back(item.first, m_wallet->IsMine(item.first), item.second.GetLabel(), item.second.purpose);
214-
}
211+
m_wallet->ForEachAddrBookEntry([&](const CTxDestination& dest, const std::string& label, const std::string& purpose, bool is_change) EXCLUSIVE_LOCKS_REQUIRED(m_wallet->cs_wallet) {
212+
if (is_change) return;
213+
result.emplace_back(dest, m_wallet->IsMine(dest), label, purpose);
214+
});
215215
return result;
216216
}
217217
std::vector<std::string> getAddressReceiveRequests() override {

0 commit comments

Comments
 (0)