highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 06:58:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

util: simplify the interface of serviceFlagToStr()

Browse Source 
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`.
This commit is contained in:
Vasil Dimov
2020-05-29 18:49:26 +02:00
parent f2e2c5ebcc
commit fbacad1880
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpc/util.cpp
View File

@@ -847,7 +847,7 @@ UniValue GetServicesNames(ServiceFlags services)
for (int i = 0; i < 64; ++i) {
const uint64_t mask = 1ull << i;
if (services_n & mask) {
servicesNames.push_back(serviceFlagToStr(mask, i));
servicesNames.push_back(serviceFlagToStr(i));
}
}