forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-17 10:20:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

common, core: use min to simplify code (#1939)

Browse source
This commit is contained in:
Daniel Liu 2026-01-16 18:23:39 +08:00 committed by GitHub
parent 80db09613e
commit 283d208fa3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/countdown/exp_duration.go
View file

@ -42,10 +42,7 @@ func (d *ExpTimeoutDuration) GetTimeoutDuration(currentRound, highestRound types
power := float64(1) power := float64(1)
// below statement must be true, just to prevent negative result // below statement must be true, just to prevent negative result
if highestRound < currentRound { if highestRound < currentRound {
exp := uint8(currentRound-highestRound) - 1 exp := min(uint8(currentRound-highestRound) - 1, d.maxExponent)
if exp > d.maxExponent {
exp = d.maxExponent
}
power = math.Pow(d.base, float64(exp)) power = math.Pow(d.base, float64(exp))
} }
return d.duration * time.Duration(power) return d.duration * time.Duration(power)

5
core/block_validator.go
View file

@ -193,10 +193,7 @@ func CalcGasLimit(parent *types.Block) uint64 {
// however, if we're now below the target (TargetGasLimit) we increase the // however, if we're now below the target (TargetGasLimit) we increase the
// limit as much as we can (parentGasLimit / 1024 -1) // limit as much as we can (parentGasLimit / 1024 -1)
if limit < params.TargetGasLimit { if limit < params.TargetGasLimit {
limit = parent.GasLimit() + decay limit = min(parent.GasLimit() + decay, params.TargetGasLimit)
if limit > params.TargetGasLimit {
limit = params.TargetGasLimit
}
} }
return limit return limit
} }