net, rpc: change CNodeStats::m_network from string to Network

jonatack · jonatack · commit af9103cc792e · 2020-12-27T14:28:31.000+01:00
diff --git a/src/net.cpp b/src/net.cpp
@@ -566,7 +566,7 @@ void CNode::copyStats(CNodeStats &stats, const std::vector<bool> &m_asmap)
     X(nServices);
     X(addr);
     X(addrBind);
-    stats.m_network = GetNetworkName(ConnectedThroughNetwork());
+    stats.m_network = ConnectedThroughNetwork();
     stats.m_mapped_as = addr.GetMappedAS(m_asmap);
     if (m_tx_relay != nullptr) {
         LOCK(m_tx_relay->cs_filter);
diff --git a/src/net.h b/src/net.h
@@ -722,8 +722,8 @@ class CNodeStats
     CAddress addr;
     // Bind address of our side of the connection
     CAddress addrBind;
-    // Name of the network the peer connected through
-    std::string m_network;
+    // Network the peer connected through
+    Network m_network;
     uint32_t m_mapped_as;
     std::string m_conn_type_string;
 };
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
@@ -188,7 +188,7 @@ static RPCHelpMan getpeerinfo()
         if (!(stats.addrLocal.empty())) {
             obj.pushKV("addrlocal", stats.addrLocal);
         }
-        obj.pushKV("network", stats.m_network);
+        obj.pushKV("network", GetNetworkName(stats.m_network));
         if (stats.m_mapped_as != 0) {
             obj.pushKV("mapped_as", uint64_t(stats.m_mapped_as));
         }

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ static RPCHelpMan getpeerinfo()`
`188`	`188`	`if (!(stats.addrLocal.empty())) {`
`189`	`189`	`obj.pushKV("addrlocal", stats.addrLocal);`
`190`	`190`	`}`
`191`		`- obj.pushKV("network", stats.m_network);`
	`191`	`+ obj.pushKV("network", GetNetworkName(stats.m_network));`
`192`	`192`	`if (stats.m_mapped_as != 0) {`
`193`	`193`	`obj.pushKV("mapped_as", uint64_t(stats.m_mapped_as));`
`194`	`194`	`}`