Clean systray icon menu for -disablewallet mode
ClosedPublic
Actions

Authored by PiRK on Oct 28 2020, 08:20.

Details

Reviewers

Group Reviewers

Restricted Owners Package	(Owns No Changed Paths)
Restricted Project

Commits

rABC326b3c7453b9: Clean systray icon menu for -disablewallet mode

Summary

This is a backport of Core PR14383 and PR15023

PR 14383 description:

There is a Debug window leftover in the system tray icon menu after PR3392 merging.
This PR makes both the app menu and the systray icon menu consistent.

PR15023 description:

PR14383 moved the debug window's menu position, to make it conditional on wallet mode. The rationale given was to match the behaviour of the 'Help' menu.

PR14573 replaced the 'Help' menu's conditional debug window with an unconditional list of items in the new 'Window' menu.

This PR reverts the no-longer-applicable part of #14383, putting the debug window back on the tray menu unconditionally, and in the position it previously had.

Note: PR14573 was backported in D7892

Test Plan

ninja && src/qt/bitcoin-qt -disablewallet

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

PiRK created this revision.Oct 28 2020, 08:20

Owners added a reviewer: Restricted Owners Package.Oct 28 2020, 08:20

Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 28 2020, 08:20

PiRK requested review of this revision.Oct 28 2020, 08:20

teamcity edited the summary of this revision. (Show Details)Oct 28 2020, 08:20

PiRK mentioned this in D8147: GUI: Restore RPC Console to non-wallet tray icon menu.Oct 28 2020, 08:23

PiRK added a child revision: D8147: GUI: Restore RPC Console to non-wallet tray icon menu.Oct 28 2020, 08:24

Harbormaster completed remote builds in B13705: Diff 25165.Oct 28 2020, 08:25

The build failed due to an unexpected infrastructure outage. The administrators have been notified to investigate. Sorry for the inconvenience.

Unknown Object (User) added a subscriber: Unknown Object (User).Oct 28 2020, 09:35

This comment was removed by deadalnix.

Build Bitcoin ABC Diffs / Diff Testing (build-debug) failed.

Failed tests logs:

====== Bitcoin ABC functional tests: rpc_bind.py ======

------- Stdout: -------
2020-10-28T10:29:21.948000Z TestFramework (INFO): Initializing test directory /work/abc-ci-builds/build-debug/test/tmp/test_runner_₿₵_  _20201028_102920/rpc_bind_451
2020-10-28T10:29:21.949000Z TestFramework (INFO): Check for linux
2020-10-28T10:29:22.013000Z TestFramework (INFO): Check for ipv6
2020-10-28T10:29:22.013000Z TestFramework (INFO): Check for non-loopback interface
2020-10-28T10:29:22.014000Z TestFramework (INFO): Bind test for []
2020-10-28T10:29:22.694000Z TestFramework (INFO): Bind test for []
2020-10-28T10:29:23.166000Z TestFramework (INFO): Bind test for ['[::1]']
2020-10-28T10:29:23.639000Z TestFramework (INFO): Bind test for ['127.0.0.1', '[::1]']
2020-10-28T10:29:24.163000Z TestFramework (INFO): Using interface 172.17.0.2 for testing
2020-10-28T10:29:24.163000Z TestFramework (INFO): Bind test for ['172.17.0.2']
2020-10-28T10:29:24.453000Z TestFramework (ERROR): Unexpected exception caught during testing
Traceback (most recent call last):
  File "/work/test/functional/test_framework/test_framework.py", line 209, in main
    self.run_test()
  File "/work/test/functional/rpc_bind.py", line 135, in run_test
    self._run_nonloopback_tests()
  File "/work/test/functional/rpc_bind.py", line 170, in _run_nonloopback_tests
    [(self.non_loopback_ip, self.defaultport)])
  File "/work/test/functional/rpc_bind.py", line 71, in run_bind_test
    assert_equal(set(get_bind_addrs(pid)), set(expected))
  File "/work/test/functional/test_framework/netutil.py", line 87, in get_bind_addrs
    inodes = get_socket_inodes(pid)
  File "/work/test/functional/test_framework/netutil.py", line 37, in get_socket_inodes
    target = os.readlink(os.path.join(base, item))
FileNotFoundError: [Errno 2] No such file or directory: '/proc/6808/fd/17'
2020-10-28T10:29:24.504000Z TestFramework (INFO): Stopping nodes
2020-10-28T10:29:24.656000Z TestFramework (WARNING): Not cleaning up dir /work/abc-ci-builds/build-debug/test/tmp/test_runner_₿₵_  _20201028_102920/rpc_bind_451
2020-10-28T10:29:24.656000Z TestFramework (ERROR): Test failed. Test logging available at /work/abc-ci-builds/build-debug/test/tmp/test_runner_₿₵_  _20201028_102920/rpc_bind_451/test_framework.log
2020-10-28T10:29:24.656000Z TestFramework (ERROR): Hint: Call /work/test/functional/combine_logs.py '/work/abc-ci-builds/build-debug/test/tmp/test_runner_₿₵_  _20201028_102920/rpc_bind_451' to consolidate all logs

Each failure log is accessible here:
Bitcoin ABC functional tests: rpc_bind.py