sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-28 13:32:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove state arg from ReconsiderBlock

Browse Source
This commit is contained in:
instagibbs 2016-05-06 12:53:23 -04:00
parent fbd84788e6
commit addb9d2a09
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.cpp
View File

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

2
src/main.h
View File

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

6
src/rpc/blockchain.cpp
View File

@ -973,7 +973,6 @@ UniValue reconsiderblock(const UniValue& params, bool fHelp)
std::string strHash = params[0].get_str(); std::string strHash = params[0].get_str();
uint256 hash(uint256S(strHash)); uint256 hash(uint256S(strHash));
CValidationState state;
{ {
LOCK(cs_main); LOCK(cs_main);
@ -981,12 +980,11 @@ UniValue reconsiderblock(const UniValue& params, bool fHelp)
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
CBlockIndex* pblockindex = mapBlockIndex[hash]; CBlockIndex* pblockindex = mapBlockIndex[hash];
ReconsiderBlock(state, pblockindex); ReconsiderBlock(pblockindex);
} }
if (state.IsValid()) { CValidationState state;
ActivateBestChain(state, Params()); ActivateBestChain(state, Params());
}
if (!state.IsValid()) { if (!state.IsValid()) {
throw JSONRPCError(RPC_DATABASE_ERROR, state.GetRejectReason()); throw JSONRPCError(RPC_DATABASE_ERROR, state.GetRejectReason());