Simplify ensure
This commit is contained in:
26
src/main.cpp
26
src/main.cpp
@@ -4195,6 +4195,32 @@ static bool IsSuperMajority(int minVersion, const CBlockIndex* pstart, unsigned
|
|||||||
void komodo_currentheight_set(int32_t height);
|
void komodo_currentheight_set(int32_t height);
|
||||||
|
|
||||||
CBlockIndex *komodo_ensure(CBlock *pblock,uint256 hash)
|
CBlockIndex *komodo_ensure(CBlock *pblock,uint256 hash)
|
||||||
|
{
|
||||||
|
CBlockIndex *pindex;
|
||||||
|
BlockMap::iterator miSelf = mapBlockIndex.find(hash);
|
||||||
|
if ( miSelf != mapBlockIndex.end() )
|
||||||
|
{
|
||||||
|
if ( (pindex= miSelf->second) == 0 ) // create pindex so first Accept block doesnt fail
|
||||||
|
{
|
||||||
|
miSelf->second = AddToBlockIndex(*pblock);
|
||||||
|
//fprintf(stderr,"Block header %s is already known, but without pindex -> ensured %p\n",hash.ToString().c_str(),miSelf->second);
|
||||||
|
}
|
||||||
|
if ( hash != Params.GetConsensus().hashGenesisBlock )
|
||||||
|
{
|
||||||
|
miSelf = mapBlockIndex.find(pblock->hashPrevBlock);
|
||||||
|
if ( miSelf != mapBlockIndex.end() )
|
||||||
|
{
|
||||||
|
if ( miSelf->second == 0 )
|
||||||
|
{
|
||||||
|
miSelf->second = InsertBlockIndex(pblock->hashPrevBlock);
|
||||||
|
fprintf(stderr,"autocreate previndex %s\n",pblock->hashPrevBlock.ToString().c_str());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
CBlockIndex *oldkomodo_ensure(CBlock *pblock,uint256 hash)
|
||||||
{
|
{
|
||||||
CBlockIndex *pindex=0,*previndex=0;
|
CBlockIndex *pindex=0,*previndex=0;
|
||||||
if ( (pindex= mapBlockIndex[hash]) == 0 )
|
if ( (pindex= mapBlockIndex[hash]) == 0 )
|
||||||
|
|||||||
Reference in New Issue
Block a user