Add GetBlockIndex(const uint256& hash) for when the caller assumes that the block index exists for the given block hash #12897
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
practicalswift
force-pushed
the
GetBlockIndex
branch
from
d97fe13
to
aa2df10
Compare
|
Heh you don't waste time do you? Concept ACK. Maybe add a comment in |
practicalswift
force-pushed
the
GetBlockIndex
branch
from
aa2df10
to
fa0b317
Compare
|
@promag Good point. Fixed! Please re-review :-) |
promag
reviewed
Apr 5, 2018
src/validation.h
Outdated
| @@ -430,13 +430,26 @@ class CVerifyDB { | |||
| /** Replay blocks that aren't fully applied to the database. */ | |||
| bool ReplayBlocks(const CChainParams& params, CCoinsView* view); | |||
|
|
|||
| // GetBlockIndex(...) should be used instead if the caller assumes that the | |||
There was a problem hiding this comment.
Maybe improve a bit:
/** Find and retrieve the block index for the given block hash.
* The caller must check if the block index is valid. If the block index
* always exists then use GetBlockIndex instead.
* Call with cs_main held.
*
* @param[in] hash The block hash
* @return The block index pointer if found, nullptr otherwise
* @see GetBlockIndex
*/
src/validation.h
Outdated
| inline CBlockIndex* LookupBlockIndex(const uint256& hash) | ||
| { | ||
| AssertLockHeld(cs_main); | ||
| BlockMap::const_iterator it = mapBlockIndex.find(hash); | ||
| return it == mapBlockIndex.end() ? nullptr : it->second; | ||
| } | ||
|
|
||
| // The caller knows if the block index exists for the given block hash. |
There was a problem hiding this comment.
/** Retrieve the block index for the given block hash.
* The block index must exists otherwise an assertion fails. If the block index
* can not exist then use LookupBlockIndex instead.
* Call with cs_main held.
*
* @param[in] hash The block hash
* @return The block index pointer
* @see LookupBlockIndex
*/ 
…e block index exists for the given block hash
practicalswift
force-pushed
the
GetBlockIndex
branch
from
fa0b317
to
23f1760
Compare
|
@promag Much better! Thanks. Updated. Please re-review :-) |
|
utACK 23f1760. Nit, commit message could be shorter. |
|
Why would we want this? It looks like just needless additional interfaces and code duplication for nothing more than an assert. NACK without justification. |
|
@TheBlueMatt yes, nothing more than that. You probably prefer #12782. |
|
Closing since lack of consensus ACK :-) |
|
@TheBlueMatt A simple |
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.
Add
GetBlockIndex(const uint256& hash)for when the caller assumes that the block index exists for the given block hash. As suggested by @promag in #12782.Rationale: Explicit is better than implicit. Especially for assumptions :-)