From 1dd62c5295ca319c94f7233bcb2e11f9d37a33f1 Mon Sep 17 00:00:00 2001
From: Jon Atack <jon@atack.com>
Date: Thu, 11 May 2023 18:35:54 -0700
Subject: [PATCH] refactor: move GetServicesNames from rpc/util.{h,cpp} to
 rpc/net.cpp

as it is only called from that compilation unit.

This avoids needlessly compiling GetServicesNames() in the 35 other files that
include rpc/util.h.
---
 src/rpc/net.cpp  | 13 +++++++++++++
 src/rpc/util.cpp | 11 -----------
 src/rpc/util.h   |  3 ---
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index f7b6c68344..50fee4a1f9 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -15,6 +15,7 @@
 #include <netbase.h>
 #include <node/context.h>
 #include <policy/settings.h>
+#include <protocol.h>
 #include <rpc/blockchain.h>
 #include <rpc/protocol.h>
 #include <rpc/server_util.h>
@@ -91,6 +92,18 @@ static RPCHelpMan ping()
     };
 }
 
+/** Returns, given services flags, a list of humanly readable (known) network services */
+static UniValue GetServicesNames(ServiceFlags services)
+{
+    UniValue servicesNames(UniValue::VARR);
+
+    for (const auto& flag : serviceFlagsToStr(services)) {
+        servicesNames.push_back(flag);
+    }
+
+    return servicesNames;
+}
+
 static RPCHelpMan getpeerinfo()
 {
     return RPCHelpMan{
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
index 9a941be181..3a8b01e01c 100644
--- a/src/rpc/util.cpp
+++ b/src/rpc/util.cpp
@@ -1302,17 +1302,6 @@ std::vector<CScript> EvalDescriptorStringOrObject(const UniValue& scanobject, Fl
     return ret;
 }
 
-UniValue GetServicesNames(ServiceFlags services)
-{
-    UniValue servicesNames(UniValue::VARR);
-
-    for (const auto& flag : serviceFlagsToStr(services)) {
-        servicesNames.push_back(flag);
-    }
-
-    return servicesNames;
-}
-
 /** Convert a vector of bilingual strings to a UniValue::VARR containing their original untranslated values. */
 [[nodiscard]] static UniValue BilingualStringsToUniValue(const std::vector<bilingual_str>& bilingual_strings)
 {
diff --git a/src/rpc/util.h b/src/rpc/util.h
index 392540ffad..663ae34d8b 100644
--- a/src/rpc/util.h
+++ b/src/rpc/util.h
@@ -132,9 +132,6 @@ std::pair<int64_t, int64_t> ParseDescriptorRange(const UniValue& value);
 /** Evaluate a descriptor given as a string, or as a {"desc":...,"range":...} object, with default range of 1000. */
 std::vector<CScript> EvalDescriptorStringOrObject(const UniValue& scanobject, FlatSigningProvider& provider, const bool expand_priv = false);
 
-/** Returns, given services flags, a list of humanly readable (known) network services */
-UniValue GetServicesNames(ServiceFlags services);
-
 /**
  * Serializing JSON objects depends on the outer type. Only arrays and
  * dictionaries can be nested in json. The top-level outer type is "NONE".