Currently, only the bottom 8 service bits are shown in the GUI peer details view.
NODE_NETWORK_LIMITED is the 11th bit (2^10).
The first commit expands the range to cover the full 64 bits, and properly label "NETWORK_LIMITED".
The second commit refactors the code so that any future omitted service bits will trigger a compile warning.
244 | @@ -245,6 +245,7 @@ const std::vector<std::string> &getAllNetMessageTypes(); 245 | 246 | /** nServices flags */ 247 | enum ServiceFlags : uint64_t { 248 | + // NOTE: When adding here, be sure to update qt/guiutil.cpp's formatServicesStr too
// NOTE: When adding here, be sure to update qt/guiutil.cpp's serviceFlagToStr too
823 | + case NODE_GETUTXO: return "GETUTXO"; 824 | + case NODE_BLOOM: return "BLOOM"; 825 | + case NODE_WITNESS: return "WITNESS"; 826 | + case NODE_NETWORK_LIMITED: return "NETWORK_LIMITED"; 827 | + // Not using default, so we get warned when a case is missing 828 | + }
Could it follow Developer Notes?
} // no default case, so the compiler can warn about missing cases
Concept ACK 4341bffb6ef10909f3721329db27c5dc9bc720dd
839 | 840 | - // Just scan the last 8 bits for now. 841 | - for (int i = 0; i < 8; i++) { 842 | - uint64_t check = 1 << i; 843 | + for (int i = 0; i < 64; i++) { 844 | + uint64_t check = 1LL << i;
nit: Could do the following, which may be more straightforward:
for (uint64_t check = 1; check; check = check << 1) {
Then we don't have the bit number, and would need to calculate it (which is more complex than the inverse).
827 | + // Not using default, so we get warned when a case is missing 828 | + } 829 | + if (bit < 8) { 830 | + return QString("%1[%2]").arg("UNKNOWN").arg(mask); 831 | + } else { 832 | + return QString("%1[2^%2]").arg("UNKNOWN").arg(bit);
Why do bits >=8 get 2^ but <8 don't?
To use the same values that were shown previously for such bits. I'm assuming eventually we'll have all 8 assigned to literal strings, and the special case can go away then.
(Also because 9223372036854775808 is a pretty big number)
OH! I get it now. But personally I'd show 2^X for all bits then from now on, there's no need for complete version to version consistency in the GUI, and the bit number is generally more useful anyhow.
utACK 4341bffb6ef10909f3721329db27c5dc9bc720dd
Tested ACK 4341bffb6ef10909f3721329db27c5dc9bc720dd
<img width="1332" alt="Bildschirmfoto 2019-11-15 um 12 59 29" src="https://user-images.githubusercontent.com/178464/68981634-2aab7000-07a8-11ea-90c8-8b3ea5570855.png">