mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-15 17:30:44 +00:00
core: replace if-else chain with tagged switch on err (#1751)
This commit is contained in:
parent
0d6807d15b
commit
7641bcfd19
1 changed files with 6 additions and 4 deletions
|
|
@ -2095,16 +2095,18 @@ func (bc *BlockChain) PrepareBlock(block *types.Block) (err error) {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
result, err := bc.getResultBlock(block, false)
|
result, err := bc.getResultBlock(block, false)
|
||||||
if err == nil {
|
switch err {
|
||||||
|
case nil:
|
||||||
bc.resultProcess.Add(block.Hash(), result)
|
bc.resultProcess.Add(block.Hash(), result)
|
||||||
return nil
|
return nil
|
||||||
} else if err == ErrKnownBlock {
|
case ErrKnownBlock:
|
||||||
return nil
|
return nil
|
||||||
} else if err == ErrStopPreparingBlock {
|
case ErrStopPreparingBlock:
|
||||||
log.Debug("Stop prepare a block because calculating", "number", block.NumberU64(), "hash", block.Hash(), "validator", block.Header().Validator)
|
log.Debug("Stop prepare a block because calculating", "number", block.NumberU64(), "hash", block.Hash(), "validator", block.Header().Validator)
|
||||||
return nil
|
return nil
|
||||||
|
default:
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (bc *BlockChain) getResultBlock(block *types.Block, verifiedM2 bool) (*ResultProcessBlock, error) {
|
func (bc *BlockChain) getResultBlock(block *types.Block, verifiedM2 bool) (*ResultProcessBlock, error) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue