Details

Reviewers

Group Reviewers

Restricted Project

Commits

rABC4a70e0886aef: GUI: Refactor formatServicesStr to warn when a ServicesFlag is missing

Summary

Backport of core 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.

Diff Detail

Repository

rABC Bitcoin ABC

Branch

PR17474

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 14202
Build 28387: Build Diff	lint-circular-dependencies · build-without-wallet · build-diff · build-debug · build-clang · build-clang-tidy
Build 28386: arc lint + arc unit

Event Timeline

Fabien created this revision.Nov 24 2020, 20:47

Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 24 2020, 20:47

Fabien requested review of this revision.Nov 24 2020, 20:47

teamcity edited the summary of this revision. (Show Details)Nov 24 2020, 20:48

Harbormaster completed remote builds in B14189: Diff 26008.Nov 24 2020, 20:48

Fabien planned changes to this revision.Nov 24 2020, 21:16

Make the code closer to code so the later backports are easier to review

Harbormaster completed remote builds in B14191: Diff 26011.Nov 24 2020, 21:30

Fabien edited the summary of this revision. (Show Details)Nov 24 2020, 21:30

Fabien added a child revision: D8518: Consolidate service flag bit-to-name conversion to a shared serviceFlagToStr function.Nov 24 2020, 22:00

It seems like you have missing dependencies.

This revision now requires changes to proceed.Nov 25 2020, 03:33

Sorry, I looked at the wrong PR. You need to explain or fix as per inline comments.

src/qt/guiutil.cpp
768 ↗	(On Diff #26011)	You can decommission this one.
772 ↗	(On Diff #26011)	It returns a different string based on bit.

Fabien edited the summary of this revision. (Show Details)Nov 25 2020, 08:02

Fabien added inline comments.Nov 25 2020, 08:04

src/qt/guiutil.cpp
768 ↗	(On Diff #26011)	Done in D8524.
772 ↗	(On Diff #26011)	I thought I edited the summary but apparently not, I will fix that. Rather than displaying differently according to the bit value, I simplified it and always display the bit number. This makes the code simpler and the `UNKNOWN` service flags easier to read. This is a "shortcut" to what core is currently doing, so when this code part is in sync the behavior will be the same and cause no conflict.