refactor, wallet: Nuke coincontrol circular dependency#17518
refactor, wallet: Nuke coincontrol circular dependency#17518meshcollider merged 1 commit intobitcoin:masterfrom
Conversation
|
Concept ACK Very nice :) |
|
ACK 80303fa2b9a8eaaa00d8c3ddf665a5026675508d. Tested on macOS 10.15.1 |
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
promag
left a comment
There was a problem hiding this comment.
ACK 80303fa2b9a8eaaa00d8c3ddf665a5026675508d.
src/wallet/init.cpp
Outdated
There was a problem hiding this comment.
While here also add #include <ui_interface.h> because of InitError.
nit, does the comment really matter?
src/wallet/coincontrol.h
Outdated
There was a problem hiding this comment.
I've tried to move these to a new header wallet/constants.h - which would allow to avoid #include <wallet/wallet.h> in some places - but suddenly it was already a lot of moved code.. so I think this is fine.
There was a problem hiding this comment.
I've tried to move these to a new header...
That was my first attempt too ;)
80303fa to
abe9546
Compare
abe9546 to
3ed5e68
Compare
|
Rebased after #16944 has been merged. |
|
re-ACK 3ed5e68 |
3ed5e68 refactor: Nuke coincontrol circular dependency (Hennadii Stepanov) Pull request description: This PR gets rid of `wallet/coincontrol` -> `wallet/wallet` -> `wallet/coincontrol` circular dependency. ACKs for top commit: Sjors: re-ACK 3ed5e68 meshcollider: utACK 3ed5e68 Tree-SHA512: 7fbceb74a9cd04157170df158d2deb979cf397df818376b478224d2423f1d8504a8688e3a9b8fc527da73e4a34ab6bc4a98be0cc2937e102a063ab2ac553e86d
…ndency 3ed5e68 refactor: Nuke coincontrol circular dependency (Hennadii Stepanov) Pull request description: This PR gets rid of `wallet/coincontrol` -> `wallet/wallet` -> `wallet/coincontrol` circular dependency. ACKs for top commit: Sjors: re-ACK 3ed5e68 meshcollider: utACK 3ed5e68 Tree-SHA512: 7fbceb74a9cd04157170df158d2deb979cf397df818376b478224d2423f1d8504a8688e3a9b8fc527da73e4a34ab6bc4a98be0cc2937e102a063ab2ac553e86d
Summary: 3ed5e6819a50434449d92cb96b9d8d141e8c7d2b refactor: Nuke coincontrol circular dependency (Hennadii Stepanov) Pull request description: This PR gets rid of `wallet/coincontrol` -> `wallet/wallet` -> `wallet/coincontrol` circular dependency. --- Backport of Core [[bitcoin/bitcoin#17518 | PR17518]] Test Plan: ninja check check-functional Reviewers: #bitcoin_abc, jasonbcox Reviewed By: #bitcoin_abc, jasonbcox Differential Revision: https://reviews.bitcoinabc.org/D7694
…ndency 3ed5e68 refactor: Nuke coincontrol circular dependency (Hennadii Stepanov) Pull request description: This PR gets rid of `wallet/coincontrol` -> `wallet/wallet` -> `wallet/coincontrol` circular dependency. ACKs for top commit: Sjors: re-ACK 3ed5e68 meshcollider: utACK 3ed5e68 Tree-SHA512: 7fbceb74a9cd04157170df158d2deb979cf397df818376b478224d2423f1d8504a8688e3a9b8fc527da73e4a34ab6bc4a98be0cc2937e102a063ab2ac553e86d
This PR gets rid of
wallet/coincontrol->wallet/wallet->wallet/coincontrolcircular dependency.