net: remove CNetAddr::ToString() and use ToStringAddr() instead

Both methods do the same thing, so simplify to having just one.

Further, `CService` inherits `CNetAddr` and `CService::ToString()`
overrides `CNetAddr::ToString()` but the latter is not virtual which
may be confusing. Avoid such a confusion by not having non-virtual
methods with the same names in inheritance.

1 files changed, 1 insertions, 6 deletions

diff --git a/src/netaddress.cpp b/src/netaddress.cpp
index 0b554dc3a2..4a7e2ef774 100644
--- a/src/netaddress.cpp
+++ b/src/netaddress.cpp
@@ -622,11 +622,6 @@ std::string CNetAddr::ToStringAddr() const
     assert(false);
 }
 
-std::string CNetAddr::ToString() const
-{
-    return ToStringAddr();
-}
-
 bool operator==(const CNetAddr& a, const CNetAddr& b)
 {
     return a.m_net == b.m_net && a.m_addr == b.m_addr;
@@ -1098,7 +1093,7 @@ std::string CSubNet::ToString() const
         break;
     }
 
-    return network.ToString() + suffix;
+    return network.ToStringAddr() + suffix;
 }
 
 bool CSubNet::IsValid() const