Bugfix: GUI: Recognise NETWORK_LIMITED in formatServicesStr #17474
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
c124bc9 to
4341bff
Compare
hebasto
requested changes
Nov 14, 2019
| @@ -245,6 +245,7 @@ const std::vector<std::string> &getAllNetMessageTypes(); | |||
|
|
|||
| /** nServices flags */ | |||
| enum ServiceFlags : uint64_t { | |||
| // NOTE: When adding here, be sure to update qt/guiutil.cpp's formatServicesStr too | |||
There was a problem hiding this comment.
Suggested change
| // 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 |
Comment on lines
+827
to
+828
| // Not using default, so we get warned when a case is missing | ||
| } |
There was a problem hiding this comment.
Could it follow Developer Notes?
Suggested change
| // Not using default, so we get warned when a case is missing | |
| } | |
| } // no default case, so the compiler can warn about missing cases |
Empact
reviewed
Nov 14, 2019
laanwj
reviewed
Nov 14, 2019
| if (bit < 8) { | ||
| return QString("%1[%2]").arg("UNKNOWN").arg(mask); | ||
| } else { | ||
| return QString("%1[2^%2]").arg("UNKNOWN").arg(bit); |
There was a problem hiding this comment.
Why do bits >=8 get 2^ but <8 don't?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
(Also because 9223372036854775808 is a pretty big number)
There was a problem hiding this comment.
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 4341bff |
|
Tested ACK 4341bff |
MarkLTZ
added a commit
to litecoinz-core/litecoinz
that referenced
this pull request
Nov 17, 2019
maflcko
pushed a commit
that referenced
this pull request
Dec 11, 2019
…sStr 4341bff GUI: Refactor formatServicesStr to warn when a ServicesFlag is missing (Luke Dashjr) df77de8 Bugfix: GUI: Recognise NETWORK_LIMITED in formatServicesStr (Luke Dashjr) Pull request description: 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. ACKs for top commit: jonasschnelli: utACK 4341bff jonasschnelli: Tested ACK 4341bff hebasto: Concept ACK 4341bff Tree-SHA512: 8338737d03fbcd92024159aabd7e632d46e13c72436d935b504d2bf7ee92b7d124e89a5917bf64d51c87f12a64de703270c2d7b4c6711fa8ed08ea7887d817c7
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Dec 12, 2019
…ServicesStr 4341bff GUI: Refactor formatServicesStr to warn when a ServicesFlag is missing (Luke Dashjr) df77de8 Bugfix: GUI: Recognise NETWORK_LIMITED in formatServicesStr (Luke Dashjr) Pull request description: 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. ACKs for top commit: jonasschnelli: utACK 4341bff jonasschnelli: Tested ACK 4341bff hebasto: Concept ACK 4341bff Tree-SHA512: 8338737d03fbcd92024159aabd7e632d46e13c72436d935b504d2bf7ee92b7d124e89a5917bf64d51c87f12a64de703270c2d7b4c6711fa8ed08ea7887d817c7
sidhujag
pushed a commit
to syscoin-core/syscoin
that referenced
this pull request
Nov 10, 2020
…ServicesStr 4341bff GUI: Refactor formatServicesStr to warn when a ServicesFlag is missing (Luke Dashjr) df77de8 Bugfix: GUI: Recognise NETWORK_LIMITED in formatServicesStr (Luke Dashjr) Pull request description: 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. ACKs for top commit: jonasschnelli: utACK 4341bff jonasschnelli: Tested ACK 4341bff hebasto: Concept ACK 4341bff Tree-SHA512: 8338737d03fbcd92024159aabd7e632d46e13c72436d935b504d2bf7ee92b7d124e89a5917bf64d51c87f12a64de703270c2d7b4c6711fa8ed08ea7887d817c7
jasonbcox
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Nov 25, 2020
Summary: Backport of core [[bitcoin/bitcoin#17474 | PR17474]]. This has been adapted to match our codebase changes from core. It introduces one change to the way the unknown service bits are displayed, to make them consistenly display as a bit number. This matches what core does when the backports are up-to-date and makes the code simpler. Test Plan: ninja check ./src/qt/bitcoin-qt Check the service bit display correctly. Reviewers: #bitcoin_abc, deadalnix Reviewed By: #bitcoin_abc, deadalnix Subscribers: deadalnix Differential Revision: https://reviews.bitcoinabc.org/D8516
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Aug 22, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Aug 22, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Sep 16, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Sep 18, 2021
UdjinM6
added a commit
to dashpay/dash
that referenced
this pull request
Sep 21, 2021
thelazier
pushed a commit
to thelazier/dash
that referenced
this pull request
Sep 25, 2021
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Oct 12, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, only the bottom 8 service bits are shown in the GUI peer details view.
NODE_NETWORK_LIMITEDis 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.