mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: use ForEachAddrBookEntry in interfaces::getAddresses

Browse Source
This commit is contained in:
furszy committed 2022-06-21 10:23:20 -03:00
1 parent 032842ae41
commit 2b48642499
2 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/interfaces/wallet.h
+1 -1
View File
@@ -114,7 +114,7 @@ public:
std::string* purpose) = 0; std::string* purpose) = 0;
//! Get wallet address list. //! Get wallet address list.
virtual std::vector<WalletAddress> getAddresses() = 0; virtual std::vector<WalletAddress> getAddresses() const = 0;
//! Get receive requests. //! Get receive requests.
virtual std::vector<std::string> getAddressReceiveRequests() = 0; virtual std::vector<std::string> getAddressReceiveRequests() = 0;
src/wallet/interfaces.cpp
+5 -5
View File
@@ -204,14 +204,14 @@ public:
} }
return true; return true;
} }
std::vector<WalletAddress> getAddresses() override std::vector<WalletAddress> getAddresses() const override
{ {
LOCK(m_wallet->cs_wallet); LOCK(m_wallet->cs_wallet);
std::vector<WalletAddress> result; std::vector<WalletAddress> result;
for (const auto& item : m_wallet->m_address_book) { m_wallet->ForEachAddrBookEntry([&](const CTxDestination& dest, const std::string& label, const std::string& purpose, bool is_change) EXCLUSIVE_LOCKS_REQUIRED(m_wallet->cs_wallet) {
if (item.second.IsChange()) continue; if (is_change) return;
result.emplace_back(item.first, m_wallet->IsMine(item.first), item.second.GetLabel(), item.second.purpose); result.emplace_back(dest, m_wallet->IsMine(dest), label, purpose);
} });
return result; return result;
} }
std::vector<std::string> getAddressReceiveRequests() override { std::vector<std::string> getAddressReceiveRequests() override {