From c31bc5bcfddf440e9a1713f7ba2ca2bf9cfa8e2e Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Mon, 17 Feb 2020 01:53:13 +0000 Subject: Consolidate service flag bit-to-name conversion to a shared serviceFlagToStr function Side effect: this results in the RPC showing unknown service bits as "UNKNOWN[n]" like the GUI. Note that there is no common mask-to-vector function because both GUI and RPC would need to iterate through it to convert to their desired target formats. --- src/rpc/util.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/rpc/util.cpp') diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp index 78586c22f..c0bc5c1f3 100644 --- a/src/rpc/util.cpp +++ b/src/rpc/util.cpp @@ -736,18 +736,15 @@ std::vector EvalDescriptorStringOrObject(const UniValue& scanobject, Fl UniValue GetServicesNames(ServiceFlags services) { + const uint64_t services_n = services; UniValue servicesNames(UniValue::VARR); - if (services & NODE_NETWORK) - servicesNames.push_back("NETWORK"); - if (services & NODE_GETUTXO) - servicesNames.push_back("GETUTXO"); - if (services & NODE_BLOOM) - servicesNames.push_back("BLOOM"); - if (services & NODE_WITNESS) - servicesNames.push_back("WITNESS"); - if (services & NODE_NETWORK_LIMITED) - servicesNames.push_back("NETWORK_LIMITED"); + for (int i = 0; i < 64; ++i) { + const uint64_t mask = 1ull << i; + if (services_n & mask) { + servicesNames.push_back(serviceFlagToStr(mask, i)); + } + } return servicesNames; } -- cgit v1.2.3