Remove GetAddrName

https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines.html#c131-avoid-trivial-getters-and-setters
MichealSD13 · Aug 26, 2021 · fa9eade · fa9eade
1 parent fa78657
commit fa9eade
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 19 deletions.
diff --git a/doc/tracing.md b/doc/tracing.md
@@ -147,7 +147,7 @@ For example:
 ```C++
 TRACE6(net, inbound_message,
     pnode->GetId(),
-    pnode->GetAddrName().c_str(),
+    pnode->m_addr_name.c_str(),
     pnode->ConnectionTypeAsString().c_str(),
     sanitizedType.c_str(),
     msg.data.size(),

diff --git a/src/net.cpp b/src/net.cpp
@@ -331,7 +331,7 @@ CNode* CConnman::FindNode(const std::string& addrName)
 {
     LOCK(cs_vNodes);
     for (CNode* pnode : vNodes) {
-        if (pnode->GetAddrName() == addrName) {
+        if (pnode->m_addr_name == addrName) {
             return pnode;
         }
     }
@@ -530,11 +530,6 @@ std::string ConnectionTypeAsString(ConnectionType conn_type)
     assert(false);
 }
 
-std::string CNode::GetAddrName() const
-{
-    return m_addr_name;
-}
-
 CService CNode::GetAddrLocal() const
 {
     LOCK(cs_addrLocal);
@@ -577,7 +572,7 @@ void CNode::copyStats(CNodeStats &stats, const std::vector<bool> &m_asmap)
     X(nLastBlockTime);
     X(nTimeConnected);
     X(nTimeOffset);
-    stats.addrName = GetAddrName();
+    X(m_addr_name);
     X(nVersion);
     {
         LOCK(cs_SubVer);
@@ -2127,7 +2122,7 @@ std::vector<AddedNodeInfo> CConnman::GetAddedNodeInfo() const
             if (pnode->addr.IsValid()) {
                 mapConnected[pnode->addr] = pnode->IsInboundConn();
             }
-            std::string addrName = pnode->GetAddrName();
+            std::string addrName{pnode->m_addr_name};
             if (!addrName.empty()) {
                 mapConnectedByName[std::move(addrName)] = std::make_pair(pnode->IsInboundConn(), static_cast<const CService&>(pnode->addr));
             }
@@ -3004,7 +2999,7 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
 
     TRACE6(net, outbound_message,
         pnode->GetId(),
-        pnode->GetAddrName().c_str(),
+        pnode->m_addr_name.c_str(),
         pnode->ConnectionTypeAsString().c_str(),
         msg.m_type.c_str(),
         msg.data.size(),

diff --git a/src/net.h b/src/net.h
@@ -248,7 +248,7 @@ class CNodeStats
     int64_t nLastBlockTime;
     int64_t nTimeConnected;
     int64_t nTimeOffset;
-    std::string addrName;
+    std::string m_addr_name;
     int nVersion;
     std::string cleanSubVer;
     bool fInbound;
@@ -659,8 +659,6 @@ class CNode
         return nLocalServices;
     }
 
-    std::string GetAddrName() const;
-
     std::string ConnectionTypeAsString() const { return ::ConnectionTypeAsString(m_conn_type); }
 
     /** A ping-pong round trip has completed successfully. Update latest and minimum ping times. */

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -4086,7 +4086,7 @@ bool PeerManagerImpl::ProcessMessages(CNode* pfrom, std::atomic<bool>& interrupt
 
     TRACE6(net, inbound_message,
         pfrom->GetId(),
-        pfrom->GetAddrName().c_str(),
+        pfrom->m_addr_name.c_str(),
         pfrom->ConnectionTypeAsString().c_str(),
         msg.m_command.c_str(),
         msg.m_recv.size(),

diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
@@ -72,7 +72,7 @@ QVariant PeerTableModel::data(const QModelIndex& index, int role) const
         case NetNodeId:
             return (qint64)rec->nodeStats.nodeid;
         case Address:
-            return QString::fromStdString(rec->nodeStats.addrName);
+            return QString::fromStdString(rec->nodeStats.m_addr_name);
         case Direction:
             return QString(rec->nodeStats.fInbound ?
                                //: An Inbound Connection from a Peer.

diff --git a/src/qt/peertablesortproxy.cpp b/src/qt/peertablesortproxy.cpp
@@ -25,7 +25,7 @@ bool PeerTableSortProxy::lessThan(const QModelIndex& left_index, const QModelInd
     case PeerTableModel::NetNodeId:
         return left_stats.nodeid < right_stats.nodeid;
     case PeerTableModel::Address:
-        return left_stats.addrName.compare(right_stats.addrName) < 0;
+        return left_stats.m_addr_name.compare(right_stats.m_addr_name) < 0;
     case PeerTableModel::Direction:
         return left_stats.fInbound > right_stats.fInbound; // default sort Inbound, then Outbound
     case PeerTableModel::ConnectionType:

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -1129,7 +1129,7 @@ void RPCConsole::updateDetailWidget()
     }
     const auto stats = selected_peers.first().data(PeerTableModel::StatsRole).value<CNodeCombinedStats*>();
     // update the detail ui with latest node information
-    QString peerAddrDetails(QString::fromStdString(stats->nodeStats.addrName) + " ");
+    QString peerAddrDetails(QString::fromStdString(stats->nodeStats.m_addr_name) + " ");
     peerAddrDetails += tr("(peer: %1)").arg(QString::number(stats->nodeStats.nodeid));
     if (!stats->nodeStats.addrLocal.empty())
         peerAddrDetails += "<br />" + tr("via %1").arg(QString::fromStdString(stats->nodeStats.addrLocal));

diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
@@ -197,7 +197,7 @@ static RPCHelpMan getpeerinfo()
         CNodeStateStats statestats;
         bool fStateStats = peerman.GetNodeStateStats(stats.nodeid, statestats);
         obj.pushKV("id", stats.nodeid);
-        obj.pushKV("addr", stats.addrName);
+        obj.pushKV("addr", stats.m_addr_name);
         if (stats.addrBind.IsValid()) {
             obj.pushKV("addrbind", stats.addrBind.ToString());
         }

diff --git a/src/test/fuzz/net.cpp b/src/test/fuzz/net.cpp
@@ -79,7 +79,6 @@ FUZZ_TARGET_INIT(net, initialize_net)
     }
 
     (void)node.GetAddrLocal();
-    (void)node.GetAddrName();
     (void)node.GetId();
     (void)node.GetLocalNonce();
     (void)node.GetLocalServices();