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/qt/guiutil.cpp | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'src/qt/guiutil.cpp') diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index c6ff0ad91d..0e316408c6 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -737,24 +737,6 @@ QString formatDurationStr(int secs) return strList.join(" "); } -QString serviceFlagToStr(const quint64 mask, const int bit) -{ - switch (ServiceFlags(mask)) { - case NODE_NONE: abort(); // impossible - case NODE_NETWORK: return "NETWORK"; - case NODE_GETUTXO: return "GETUTXO"; - case NODE_BLOOM: return "BLOOM"; - case NODE_WITNESS: return "WITNESS"; - case NODE_NETWORK_LIMITED: return "NETWORK_LIMITED"; - // Not using default, so we get warned when a case is missing - } - if (bit < 8) { - return QString("%1[%2]").arg("UNKNOWN").arg(mask); - } else { - return QString("%1[2^%2]").arg("UNKNOWN").arg(bit); - } -} - QString formatServicesStr(quint64 mask) { QStringList strList; @@ -763,7 +745,7 @@ QString formatServicesStr(quint64 mask) uint64_t check = 1ull << i; if (mask & check) { - strList.append(serviceFlagToStr(check, i)); + strList.append(QString::fromStdString(serviceFlagToStr(mask, i))); } } -- cgit v1.2.3