From c9d548c91fb12fba516dee896f1f97692cfa2104 Mon Sep 17 00:00:00 2001 From: Vasil Dimov Date: Fri, 15 Jul 2022 17:56:30 +0200 Subject: [PATCH] net: remove CService::ToStringPort() It is used only internally in `CService::ToStringAddrPort()`. --- src/netaddress.cpp | 11 ++++------- src/netaddress.h | 1 - src/test/fuzz/netaddress.cpp | 1 - 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/netaddress.cpp b/src/netaddress.cpp index ba29aa5f64d..13c505ca348 100644 --- a/src/netaddress.cpp +++ b/src/netaddress.cpp @@ -911,17 +911,14 @@ std::vector CService::GetKey() const return key; } -std::string CService::ToStringPort() const -{ - return strprintf("%u", port); -} - std::string CService::ToStringAddrPort() const { + const auto port_str = strprintf("%u", port); + if (IsIPv4() || IsTor() || IsI2P() || IsInternal()) { - return ToStringAddr() + ":" + ToStringPort(); + return ToStringAddr() + ":" + port_str; } else { - return "[" + ToStringAddr() + "]:" + ToStringPort(); + return "[" + ToStringAddr() + "]:" + port_str; } } diff --git a/src/netaddress.h b/src/netaddress.h index 8fb34194cb8..a465e53809a 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -535,7 +535,6 @@ public: friend bool operator!=(const CService& a, const CService& b) { return !(a == b); } friend bool operator<(const CService& a, const CService& b); std::vector GetKey() const; - std::string ToStringPort() const; std::string ToStringAddrPort() const; CService(const struct in6_addr& ipv6Addr, uint16_t port); diff --git a/src/test/fuzz/netaddress.cpp b/src/test/fuzz/netaddress.cpp index ad18b35637b..5ffa200238b 100644 --- a/src/test/fuzz/netaddress.cpp +++ b/src/test/fuzz/netaddress.cpp @@ -80,7 +80,6 @@ FUZZ_TARGET(netaddress) (void)service.GetKey(); (void)service.GetPort(); (void)service.ToStringAddrPort(); - (void)service.ToStringPort(); (void)CServiceHash()(service); (void)CServiceHash(0, 0)(service);