diff options
author | Jonas Schnelli <dev@jonasschnelli.ch> | 2020-05-29 19:43:02 +0200 |
---|---|---|
committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2020-05-29 19:43:08 +0200 |
commit | 8ad5f1c376fe99eeccac2696ac0e18e662323a4d (patch) | |
tree | 6606a54b09b3571aec34a401cae205df83417b79 /src/rpc | |
parent | c19fd96694d15966f1cc83c43bae2746b92d3149 (diff) | |
parent | 189ae0c38b7d4927c5c73b94664e9542b2b06ed9 (diff) | |
download | bitcoin-8ad5f1c376fe99eeccac2696ac0e18e662323a4d.tar.xz |
Merge #19106: util: simplify the interface of serviceFlagToStr()
189ae0c38b7d4927c5c73b94664e9542b2b06ed9 util: dedup code in callers of serviceFlagToStr() (Vasil Dimov)
fbacad1880341ace31f669530c66d4e322d19235 util: simplify the interface of serviceFlagToStr() (Vasil Dimov)
Pull request description:
Don't take two redundant arguments in `serviceFlagToStr()`.
Introduce `serviceFlagsToStr()` which takes a mask (with more than one
bit set) and returns a vector of strings.
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`.
ACKs for top commit:
MarcoFalke:
ACK 189ae0c38b7d4927c5c73b94664e9542b2b06ed9
jonasschnelli:
Tested ACK 189ae0c38b7d4927c5c73b94664e9542b2b06ed9
Tree-SHA512: 000c490f16ebbba04458c62ca4ce743abffd344d375d95f5bbd5008742012032787655db2874b168df0270743266261dccf1693761906567502dcbac902bda50
Diffstat (limited to 'src/rpc')
-rw-r--r-- | src/rpc/util.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp index 0e13d8dfce..39bf05fbbd 100644 --- a/src/rpc/util.cpp +++ b/src/rpc/util.cpp @@ -841,14 +841,10 @@ std::vector<CScript> EvalDescriptorStringOrObject(const UniValue& scanobject, Fl UniValue GetServicesNames(ServiceFlags services) { - const uint64_t services_n = services; UniValue servicesNames(UniValue::VARR); - for (int i = 0; i < 64; ++i) { - const uint64_t mask = 1ull << i; - if (services_n & mask) { - servicesNames.push_back(serviceFlagToStr(mask, i)); - } + for (const auto& flag : serviceFlagsToStr(services)) { + servicesNames.push_back(flag); } return servicesNames; |