From dd8f7f250095e58bbf4cd4effb481b52143bd1ed Mon Sep 17 00:00:00 2001 From: Amiti Uttarwar Date: Fri, 10 Sep 2021 18:16:37 -0600 Subject: scripted-diff: Rename CAddrMan to AddrMan -BEGIN VERIFY SCRIPT- git grep -l CAddrMan src/ test/ | xargs sed -i 's/CAddrMan/AddrMan/g' -END VERIFY SCRIPT- --- src/addrman.cpp | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'src/addrman.cpp') diff --git a/src/addrman.cpp b/src/addrman.cpp index ef1538b6e9..42d4b5a6e5 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -269,14 +269,14 @@ void AddrManImpl::Unserialize(Stream& s_) if (nNew > ADDRMAN_NEW_BUCKET_COUNT * ADDRMAN_BUCKET_SIZE || nNew < 0) { throw std::ios_base::failure( - strprintf("Corrupt CAddrMan serialization: nNew=%d, should be in [0, %d]", + strprintf("Corrupt AddrMan serialization: nNew=%d, should be in [0, %d]", nNew, ADDRMAN_NEW_BUCKET_COUNT * ADDRMAN_BUCKET_SIZE)); } if (nTried > ADDRMAN_TRIED_BUCKET_COUNT * ADDRMAN_BUCKET_SIZE || nTried < 0) { throw std::ios_base::failure( - strprintf("Corrupt CAddrMan serialization: nTried=%d, should be in [0, %d]", + strprintf("Corrupt AddrMan serialization: nTried=%d, should be in [0, %d]", nTried, ADDRMAN_TRIED_BUCKET_COUNT * ADDRMAN_BUCKET_SIZE)); } @@ -1110,83 +1110,83 @@ const std::vector& AddrManImpl::GetAsmap() const return m_asmap; } -CAddrMan::CAddrMan(std::vector asmap, bool deterministic, int32_t consistency_check_ratio) +AddrMan::AddrMan(std::vector asmap, bool deterministic, int32_t consistency_check_ratio) : m_impl(std::make_unique(std::move(asmap), deterministic, consistency_check_ratio)) {} -CAddrMan::~CAddrMan() = default; +AddrMan::~AddrMan() = default; template -void CAddrMan::Serialize(Stream& s_) const +void AddrMan::Serialize(Stream& s_) const { m_impl->Serialize(s_); } template -void CAddrMan::Unserialize(Stream& s_) +void AddrMan::Unserialize(Stream& s_) { m_impl->Unserialize(s_); } // explicit instantiation -template void CAddrMan::Serialize(CHashWriter& s) const; -template void CAddrMan::Serialize(CAutoFile& s) const; -template void CAddrMan::Serialize(CDataStream& s) const; -template void CAddrMan::Unserialize(CAutoFile& s); -template void CAddrMan::Unserialize(CHashVerifier& s); -template void CAddrMan::Unserialize(CDataStream& s); -template void CAddrMan::Unserialize(CHashVerifier& s); - -size_t CAddrMan::size() const +template void AddrMan::Serialize(CHashWriter& s) const; +template void AddrMan::Serialize(CAutoFile& s) const; +template void AddrMan::Serialize(CDataStream& s) const; +template void AddrMan::Unserialize(CAutoFile& s); +template void AddrMan::Unserialize(CHashVerifier& s); +template void AddrMan::Unserialize(CDataStream& s); +template void AddrMan::Unserialize(CHashVerifier& s); + +size_t AddrMan::size() const { return m_impl->size(); } -bool CAddrMan::Add(const std::vector &vAddr, const CNetAddr& source, int64_t nTimePenalty) +bool AddrMan::Add(const std::vector &vAddr, const CNetAddr& source, int64_t nTimePenalty) { return m_impl->Add(vAddr, source, nTimePenalty); } -void CAddrMan::Good(const CService &addr, int64_t nTime) +void AddrMan::Good(const CService &addr, int64_t nTime) { m_impl->Good(addr, nTime); } -void CAddrMan::Attempt(const CService &addr, bool fCountFailure, int64_t nTime) +void AddrMan::Attempt(const CService &addr, bool fCountFailure, int64_t nTime) { m_impl->Attempt(addr, fCountFailure, nTime); } -void CAddrMan::ResolveCollisions() +void AddrMan::ResolveCollisions() { m_impl->ResolveCollisions(); } -std::pair CAddrMan::SelectTriedCollision() +std::pair AddrMan::SelectTriedCollision() { return m_impl->SelectTriedCollision(); } -std::pair CAddrMan::Select(bool newOnly) const +std::pair AddrMan::Select(bool newOnly) const { return m_impl->Select(newOnly); } -std::vector CAddrMan::GetAddr(size_t max_addresses, size_t max_pct, std::optional network) const +std::vector AddrMan::GetAddr(size_t max_addresses, size_t max_pct, std::optional network) const { return m_impl->GetAddr(max_addresses, max_pct, network); } -void CAddrMan::Connected(const CService &addr, int64_t nTime) +void AddrMan::Connected(const CService &addr, int64_t nTime) { m_impl->Connected(addr, nTime); } -void CAddrMan::SetServices(const CService &addr, ServiceFlags nServices) +void AddrMan::SetServices(const CService &addr, ServiceFlags nServices) { m_impl->SetServices(addr, nServices); } -const std::vector& CAddrMan::GetAsmap() const +const std::vector& AddrMan::GetAsmap() const { return m_impl->GetAsmap(); } -- cgit v1.2.3