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

fix: staticcheck warning SA4003: every value of uint64 >= 0

Browse source
This commit is contained in:
Daniel Liu 2024-10-29 11:29:13 +08:00
parent 7b7eb91fcb
commit f9960875cc
3 changed files with 111 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
eth/hooks/engine_v1_hooks.go
View file

@ -30,7 +30,7 @@ func AttachConsensusV1Hooks(adaptor *XDPoS.XDPoS, bc *core.BlockChain, chainConf
log.Crit("Can't get state at head of canonical chain", "head number", bc.CurrentHeader().Number.Uint64(), "err", err) log.Crit("Can't get state at head of canonical chain", "head number", bc.CurrentHeader().Number.Uint64(), "err", err)
} }
prevEpoc := blockNumberEpoc - chain.Config().XDPoS.Epoch prevEpoc := blockNumberEpoc - chain.Config().XDPoS.Epoch
if prevEpoc >= 0 {
start := time.Now() start := time.Now()
prevHeader := chain.GetHeaderByNumber(prevEpoc) prevHeader := chain.GetHeaderByNumber(prevEpoc)
penSigners := adaptor.GetMasternodes(chain, prevHeader) penSigners := adaptor.GetMasternodes(chain, prevHeader)
@ -65,8 +65,7 @@ func AttachConsensusV1Hooks(adaptor *XDPoS.XDPoS, bc *core.BlockChain, chainConf
} }
log.Debug("Time Calculated HookPenalty ", "block", blockNumberEpoc, "time", common.PrettyDuration(time.Since(start))) log.Debug("Time Calculated HookPenalty ", "block", blockNumberEpoc, "time", common.PrettyDuration(time.Since(start)))
return penSigners, nil return penSigners, nil
}
return []common.Address{}, nil
} }
// Hook scans for bad masternodes and decide to penalty them // Hook scans for bad masternodes and decide to penalty them
@ -77,7 +76,7 @@ func AttachConsensusV1Hooks(adaptor *XDPoS.XDPoS, bc *core.BlockChain, chainConf
if header.Number.Uint64() > comebackLength { if header.Number.Uint64() > comebackLength {
combackEpoch = header.Number.Uint64() - comebackLength combackEpoch = header.Number.Uint64() - comebackLength
} }
if prevEpoc >= 0 {
start := time.Now() start := time.Now()
listBlockHash := make([]common.Hash, chain.Config().XDPoS.Epoch) listBlockHash := make([]common.Hash, chain.Config().XDPoS.Epoch)
@ -173,10 +172,9 @@ func AttachConsensusV1Hooks(adaptor *XDPoS.XDPoS, bc *core.BlockChain, chainConf
if chain.Config().IsTIPRandomize(header.Number) { if chain.Config().IsTIPRandomize(header.Number) {
return penalties, nil return penalties, nil
} }
return penComebacks, nil return penComebacks, nil
} }
return []common.Address{}, nil
}
// Hook prepares validators M2 for the current epoch at checkpoint block // Hook prepares validators M2 for the current epoch at checkpoint block
adaptor.EngineV1.HookValidator = func(header *types.Header, signers []common.Address) ([]byte, error) { adaptor.EngineV1.HookValidator = func(header *types.Header, signers []common.Address) ([]byte, error) {

2
p2p/discv5/net.go
View file

@ -1230,7 +1230,7 @@ func (net *Network) checkTopicRegister(data *topicRegister) (*pong, error) {
if rlpHash(data.Topics) != pongpkt.data.(*pong).TopicHash { if rlpHash(data.Topics) != pongpkt.data.(*pong).TopicHash {
return nil, errors.New("topic hash mismatch") return nil, errors.New("topic hash mismatch")
} }
if data.Idx < 0 || int(data.Idx) >= len(data.Topics) { if int(data.Idx) >= len(data.Topics) {
return nil, errors.New("topic index out of range") return nil, errors.New("topic index out of range")
} }
return pongpkt.data.(*pong), nil return pongpkt.data.(*pong), nil

2
p2p/discv5/nodeevent_string.go
View file

@ -16,7 +16,7 @@ var (
func (i nodeEvent) String() string { func (i nodeEvent) String() string {
switch { switch {
case 0 <= i && i <= 8: case i <= 8:
return _nodeEvent_name_0[_nodeEvent_index_0[i]:_nodeEvent_index_0[i+1]] return _nodeEvent_name_0[_nodeEvent_index_0[i]:_nodeEvent_index_0[i+1]]
case 265 <= i && i <= 267: case 265 <= i && i <= 267:
i -= 265 i -= 265