Rename ReconsiderBlock func to reflect real behavior

This commit is contained in:
instagibbs 2016-05-09 11:26:37 -04:00
parent addb9d2a09
commit 657e07efa3
3 changed files with 3 additions and 3 deletions

View File

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

View File

@ -464,7 +464,7 @@ CBlockIndex* FindForkInGlobalIndex(const CChain& chain, const CBlockLocator& loc
bool InvalidateBlock(CValidationState& state, const CChainParams& chainparams, CBlockIndex *pindex);
/** Remove invalidity status from a block and its descendants. */
bool ReconsiderBlock(CBlockIndex *pindex);
bool ResetBlockFailureFlags(CBlockIndex *pindex);
/** The currently-connected chain of blocks (protected by cs_main). */
extern CChain chainActive;

View File

@ -980,7 +980,7 @@ UniValue reconsiderblock(const UniValue& params, bool fHelp)
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
CBlockIndex* pblockindex = mapBlockIndex[hash];
ReconsiderBlock(pblockindex);
ResetBlockFailureFlags(pblockindex);
}
CValidationState state;