@@ -3591,14 +3591,14 @@ bool CChainState::AcceptBlock(const std::shared_ptr<const CBlock>& pblock, Block
3591
3591
return true ;
3592
3592
}
3593
3593
3594
- bool ChainstateManager::ProcessNewBlock (const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock , bool fForceProcessing , bool * fNewBlock )
3594
+ bool ChainstateManager::ProcessNewBlock (const CChainParams& chainparams, const std::shared_ptr<const CBlock>& block , bool force_processing , bool * new_block )
3595
3595
{
3596
3596
AssertLockNotHeld (cs_main);
3597
3597
assert (std::addressof (::ChainstateActive ()) == std::addressof (ActiveChainstate ()));
3598
3598
3599
3599
{
3600
3600
CBlockIndex *pindex = nullptr ;
3601
- if (fNewBlock ) *fNewBlock = false ;
3601
+ if (new_block ) *new_block = false ;
3602
3602
BlockValidationState state;
3603
3603
3604
3604
// CheckBlock() does not support multi-threaded block validation because CBlock::fChecked can cause data race.
@@ -3607,21 +3607,21 @@ bool ChainstateManager::ProcessNewBlock(const CChainParams& chainparams, const s
3607
3607
3608
3608
// Ensure that CheckBlock() passes before calling AcceptBlock, as
3609
3609
// belt-and-suspenders.
3610
- bool ret = CheckBlock (*pblock , state, chainparams.GetConsensus ());
3610
+ bool ret = CheckBlock (*block , state, chainparams.GetConsensus ());
3611
3611
if (ret) {
3612
3612
// Store to disk
3613
- ret = ActiveChainstate ().AcceptBlock (pblock , state, chainparams, &pindex, fForceProcessing , nullptr , fNewBlock );
3613
+ ret = ActiveChainstate ().AcceptBlock (block , state, chainparams, &pindex, force_processing , nullptr , new_block );
3614
3614
}
3615
3615
if (!ret) {
3616
- GetMainSignals ().BlockChecked (*pblock , state);
3616
+ GetMainSignals ().BlockChecked (*block , state);
3617
3617
return error (" %s: AcceptBlock FAILED (%s)" , __func__, state.ToString ());
3618
3618
}
3619
3619
}
3620
3620
3621
3621
NotifyHeaderTip (ActiveChainstate ());
3622
3622
3623
3623
BlockValidationState state; // Only used to report errors, not invalidity - ignore it
3624
- if (!ActiveChainstate ().ActivateBestChain (state, chainparams, pblock ))
3624
+ if (!ActiveChainstate ().ActivateBestChain (state, chainparams, block ))
3625
3625
return error (" %s: ActivateBestChain failed (%s)" , __func__, state.ToString ());
3626
3626
3627
3627
return true ;
0 commit comments