wallet: Recognize -disablewallet option early
ClosedPublic
Actions

Authored by PiRK on Oct 12 2020, 13:55.

Details

Reviewers

Group Reviewers

Restricted Owners Package	(Owns No Changed Paths)
Restricted Project

Commits

Summary

PR description:

This PR makes early check for the -disablewallet option.
If -disablewallet=1, objects PaymentServer and WalletController are nor created.

Backport of Core PR16436

Test Plan

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

Repository

rABC Bitcoin ABC

Branch

backport-pr16436

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 13362
Build 26763: Build Diff	lint-circular-dependencies · build-clang-tidy · build-diff · build-without-wallet · build-clang
Build 26762: arc lint + arc unit

PiRK created this revision.Oct 12 2020, 13:55

Owners added a reviewer: Restricted Owners Package.Oct 12 2020, 13:55

PiRK requested review of this revision.Oct 12 2020, 13:55

deadalnix requested changes to this revision.Oct 12 2020, 15:03

deadalnix added a subscriber: deadalnix.

deadalnix added inline comments.

src/qt/bitcoin.cpp
356	This is a not part of the PR. Is there a missing dependency? Considering this is manually managed, if this is initialized twice, this is now leaking.

This revision now requires changes to proceed.Oct 12 2020, 15:03

PiRK requested review of this revision.Oct 12 2020, 16:17

PiRK added inline comments.

src/qt/bitcoin.cpp
356	The problem is that D2134 change the indentation of the entire `BitcoinApplication::initializeResult` method in Bitcoin ABC compared to Bitcoin Core. But as far as I can tell, the behavior remained strictly identical. Basically, D2134 changed if (success) { A } else { B } into if (!success) { B return; } A As a consequence, the diffs look widely different between here and https://github.com/bitcoin/bitcoin/pull/16436/files. But as far as I can tell, it's the same code. `clientModel` was initially on line 375, and was moved above the `m_wallet_controller` initialization. To make it clearer, I could first undo the change from D2134 in this piece of code, and then redo this backport.