From fbacad1880341ace31f669530c66d4e322d19235 Mon Sep 17 00:00:00 2001 From: Vasil Dimov Date: Fri, 29 May 2020 18:49:26 +0200 Subject: util: simplify the interface of serviceFlagToStr() Don't take two redundant arguments in `serviceFlagToStr()`. As a side effect this fixes an issue introduced in https://github.com/bitcoin/bitcoin/pull/18165 due to which the GUI could print something like `UNKNOWN[1033] & UNKNOWN[1033] & UNKNOWN[2^10]` instead of `NETWORK & WITNESS`. --- src/qt/guiutil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qt/guiutil.cpp') diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index e78e400f07..d2892f32c7 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -759,7 +759,7 @@ QString formatServicesStr(quint64 mask) uint64_t check = 1ull << i; if (mask & check) { - strList.append(QString::fromStdString(serviceFlagToStr(mask, i))); + strList.append(QString::fromStdString(serviceFlagToStr(i))); } } -- cgit v1.2.3