[Trivial][Cleanup] Remove extra checks before GetBlocksToMaturity #1281
Conversation
This file contains hidden or 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
Collaborator
|
needs rebase |
random-zebra
force-pushed
the
2020_GetBlocksToMaturity
branch
from
18f331c to
97405bd
Compare
Author
|
Rebased. Only one instance is left (the other one was fixed in bc6ae73). |
random-zebra
force-pushed
the
2020_GetBlocksToMaturity
branch
from
97405bd to
4d38d42
Compare
furszy
approved these changes
Jan 22, 2020
| { | ||
| LOCK(cs_main); | ||
| if ((IsCoinBase() || IsCoinStake()) && GetBlocksToMaturity() > 0 && IsInMainChain()) { | ||
| if (GetBlocksToMaturity() > 0 && IsInMainChain()) { |
There was a problem hiding this comment.
This can unified in just a single method call.
GetBlocksToMaturityis calling internallyGetDepthInMainChain.IsInMainChainis calling internallyGetDepthInMainChain.
Fuzzbawls
approved these changes
Jan 23, 2020
random-zebra
added a commit
that referenced
this pull request
Jan 23, 2020
…oMaturity 4d38d42 [Wallet] Remove extra checks before GetBlocksToMaturity (random-zebra) Pull request description: Ref: #1263 (comment) `GetBlocksToMaturity` returns `0` for txes that are neither coinbases nor coinstakes, so no need to check that before. There are actually only two places needing this quick cleanup. Note: there are, instead, several occurrences of `if (IsCoinBase() && GetBlocksToMaturity() > 0)` (i.e. test failing for coinstakes but not coinbases). These need further inspection because a change there affects reported balances (e.g. in `CWalletTx::UpdateAmount` or `CWalletTx::GetUnlockedCredit`). ACKs for top commit: furszy: This is ok, ACK 4d38d42 Fuzzbawls: utACK 4d38d42 Tree-SHA512: 50693af631a653be940a77aa6a52ec17490236fd56a843536689a0e04c0a10c85edeccd254aa389d84d89c24fb916d54c3703bf8eb18d958d9ee1bbd0428ea60
furszy
added a commit
that referenced
this pull request
Feb 4, 2020
b32e418 [Wallet] Add function CMerkleTx::IsInMainChainImmature (random-zebra) Pull request description: This introduces a little performance optimization, removing the double call to `GetDepthInMainChain` (ref: #1281 (comment)). Note: in a successive PR we should review the LOCKs in this area of the wallet. ACKs for top commit: furszy: utACK b32e418 Tree-SHA512: 69e16557dd67e0450b3b9a14a3a182be39bdfcec8ef5a49ca156d9511cd9a7a532c650ed8440b147795dc3d003d10f1c8c737d0990db6365cdada2eb66997892
wqking
pushed a commit
to wqking-temp/Vitae
that referenced
this pull request
Jul 29, 2020
b32e4181f3b644ebe7d432b3308fee18ee8d7e6f [Wallet] Add function CMerkleTx::IsInMainChainImmature (random-zebra) Pull request description: This introduces a little performance optimization, removing the double call to `GetDepthInMainChain` (ref: PIVX-Project/PIVX#1281 (comment)). Note: in a successive PR we should review the LOCKs in this area of the wallet. ACKs for top commit: furszy: utACK b32e418 Tree-SHA512: 69e16557dd67e0450b3b9a14a3a182be39bdfcec8ef5a49ca156d9511cd9a7a532c650ed8440b147795dc3d003d10f1c8c737d0990db6365cdada2eb66997892
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Ref: #1263 (comment)
GetBlocksToMaturityreturns0for txes that are neither coinbases nor coinstakes, so no need to check that before.There are actually only two places needing this quick cleanup.
Note: there are, instead, several occurrences of
if (IsCoinBase() && GetBlocksToMaturity() > 0)(i.e. test failing for coinstakes but not coinbases).These need further inspection because a change there affects reported balances (e.g. in
CWalletTx::UpdateAmountorCWalletTx::GetUnlockedCredit).