Merge #8019: Remove state arg from ReconsiderBlock, rename to ResetBlockFailureFlags

657e07e Rename ReconsiderBlock func to reflect real behavior (instagibbs)
addb9d2 Remove state arg from ReconsiderBlock (instagibbs)
This commit is contained in:
Wladimir J. van der Laan
2016-05-10 12:43:19 +02:00
3 changed files with 5 additions and 7 deletions

View File

@@ -3008,7 +3008,7 @@ bool InvalidateBlock(CValidationState& state, const CChainParams& chainparams, C
return true;
}
bool ReconsiderBlock(CValidationState& state, CBlockIndex *pindex) {
bool ResetBlockFailureFlags(CBlockIndex *pindex) {
AssertLockHeld(cs_main);
int nHeight = pindex->nHeight;