refactor: remove redundant fOnlySafe argument #21910
Merged
+8
−6
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
The fOnlySafe argument to AvailableCoins is now redundant, since bitcoin#21359 added a similar field inside the CCoinControl struct. Not all code paths set a CCoinControl instance, but when it's missing we can default to using only safe inputs which is backwards-compatible.
promag
reviewed
May 12, 2021
| @@ -2197,7 +2197,7 @@ CAmount CWallet::GetAvailableBalance(const CCoinControl* coinControl) const | |||
|
|
|||
| CAmount balance = 0; | |||
| std::vector<COutput> vCoins; | |||
| AvailableCoins(vCoins, true, coinControl); | |||
| AvailableCoins(vCoins, coinControl); | |||
There was a problem hiding this comment.
Not an actual refactor because this changes behavior. But in practice AMT there's no call to GetAvailableBalance with m_include_unsafe_inputs = true.
There was a problem hiding this comment.
Good catch, it does change behavior here but is backwards-compatible so I think it should be ok.
If later we want to make GetAvailableBalance with m_include_unsafe_inputs = true possible, we can use coinControl for that.
achow101
approved these changes
May 12, 2021
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
May 13, 2021
gwillen
pushed a commit
to ElementsProject/elements
that referenced
this pull request
Jun 1, 2022
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.
The
fOnlySafeargument toAvailableCoinsis now redundant, since #21359 added a similar field inside theCCoinControlstruct (see #21359 (comment)).Not all code paths create a
CCoinControlinstance, but when it's missing we can default to using only safe inputs which is backwards-compatible.