forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-16 09:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: always check for error value and return nil, err where possible (#426)

Browse source 
Co-authored-by: wjrjerome <wjrjerome@babylonchain.io>
This commit is contained in:
Banana-J 2024-02-11 20:32:24 +11:00 committed by GitHub
parent b739db6a52
commit a54a645cda
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
consensus/XDPoS/XDPoS.go
View file

@ -451,6 +451,9 @@ func (x *XDPoS) GetSnapshot(chain consensus.ChainReader, header *types.Header) (
switch x.config.BlockConsensusVersion(header.Number, header.Extra, ExtraFieldCheck) { switch x.config.BlockConsensusVersion(header.Number, header.Extra, ExtraFieldCheck) {
case params.ConsensusEngineVersion2: case params.ConsensusEngineVersion2:
sp, err := x.EngineV2.GetSnapshot(chain, header) sp, err := x.EngineV2.GetSnapshot(chain, header)
if err != nil {
return nil, err
}
return &utils.PublicApiSnapshot{ return &utils.PublicApiSnapshot{
Number: sp.Number, Number: sp.Number,
Hash: sp.Hash, Hash: sp.Hash,
@ -458,6 +461,9 @@ func (x *XDPoS) GetSnapshot(chain consensus.ChainReader, header *types.Header) (
}, err }, err
default: // Default "v1" default: // Default "v1"
sp, err := x.EngineV1.GetSnapshot(chain, header) sp, err := x.EngineV1.GetSnapshot(chain, header)
if err != nil {
return nil, err
}
// Convert to a standard PublicApiSnapshot type, otherwise it's a breaking change to API // Convert to a standard PublicApiSnapshot type, otherwise it's a breaking change to API
return &utils.PublicApiSnapshot{ return &utils.PublicApiSnapshot{
Number: sp.Number, Number: sp.Number,

3
consensus/XDPoS/engines/engine_v2/utils.go
View file

@ -161,6 +161,9 @@ func (x *XDPoS_v2) GetRoundNumber(header *types.Header) (types.Round, error) {
func (x *XDPoS_v2) GetSignersFromSnapshot(chain consensus.ChainReader, header *types.Header) ([]common.Address, error) { func (x *XDPoS_v2) GetSignersFromSnapshot(chain consensus.ChainReader, header *types.Header) ([]common.Address, error) {
snap, err := x.getSnapshot(chain, header.Number.Uint64(), false) snap, err := x.getSnapshot(chain, header.Number.Uint64(), false)
if err != nil {
return nil, err
}
return snap.NextEpochMasterNodes, err return snap.NextEpochMasterNodes, err
} }