refactor, wallet: Nuke coincontrol circular dependency #17518
Merged
Conversation
This file contains 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
|
Concept ACK Very nice :) |
|
ACK 80303fa. 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
reviewed
Nov 21, 2019
src/wallet/init.cpp
Outdated
| @@ -11,6 +11,7 @@ | |||
| #include <util/moneystr.h> | |||
| #include <util/system.h> | |||
| #include <util/translation.h> | |||
| #include <wallet/coincontrol.h> // for DEFAULT_AVOIDPARTIALSPENDS | |||
There was a problem hiding this comment.
While here also add #include <ui_interface.h> because of InitError.
nit, does the comment really matter?
|
|
||
| const int DEFAULT_MIN_DEPTH = 0; | ||
| const int DEFAULT_MAX_DEPTH = 9999999; | ||
|
|
||
| //! Default for -avoidpartialspends | ||
| static constexpr bool DEFAULT_AVOIDPARTIALSPENDS = false; |
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 ;)
hebasto
force-pushed
the
20191119-coincontrol-dep
branch
from
80303fa
to
abe9546
Compare
hebasto
force-pushed
the
20191119-coincontrol-dep
branch
from
abe9546
to
3ed5e68
Compare
|
Rebased after #16944 has been merged. |
|
re-ACK 3ed5e68 |
meshcollider
added a commit
that referenced
this pull request
Nov 24, 2019
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
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Nov 24, 2019
…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
MarkLTZ
added a commit
to litecoinz-core/litecoinz
that referenced
this pull request
Nov 29, 2019
jasonbcox
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Oct 1, 2020
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
sidhujag
pushed a commit
to syscoin-core/syscoin
that referenced
this pull request
Nov 10, 2020
…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
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.
This PR gets rid of
wallet/coincontrol->wallet/wallet->wallet/coincontrolcircular dependency.