mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-15 08:23:46 +00:00
bugfix
This commit is contained in:
parent
2b84185173
commit
22988ac97b
1 changed files with 22 additions and 2 deletions
|
|
@ -592,11 +592,11 @@ func (b *BorConfig) String() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *BorConfig) CalculateProducerDelay(number uint64) uint64 {
|
func (c *BorConfig) CalculateProducerDelay(number uint64) uint64 {
|
||||||
return c.calculateBorConfigHelper(c.ProducerDelay, number)
|
return c.calculateSprintSizeHelper(c.ProducerDelay, number)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *BorConfig) CalculateSprint(number uint64) uint64 {
|
func (c *BorConfig) CalculateSprint(number uint64) uint64 {
|
||||||
return c.calculateBorConfigHelper(c.Sprint, number)
|
return c.calculateSprintSizeHelper(c.Sprint, number)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *BorConfig) CalculateBackupMultiplier(number uint64) uint64 {
|
func (c *BorConfig) CalculateBackupMultiplier(number uint64) uint64 {
|
||||||
|
|
@ -623,6 +623,26 @@ func (c *BorConfig) calculateBorConfigHelper(field map[string]uint64, number uin
|
||||||
|
|
||||||
sort.Strings(keys)
|
sort.Strings(keys)
|
||||||
|
|
||||||
|
for i := 0; i < len(keys)-1; i++ {
|
||||||
|
valUint, _ := strconv.ParseUint(keys[i], 10, 64)
|
||||||
|
valUintNext, _ := strconv.ParseUint(keys[i+1], 10, 64)
|
||||||
|
|
||||||
|
if number > valUint && number < valUintNext {
|
||||||
|
return field[keys[i]]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return field[keys[len(keys)-1]]
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *BorConfig) calculateSprintSizeHelper(field map[string]uint64, number uint64) uint64 {
|
||||||
|
keys := make([]string, 0, len(field))
|
||||||
|
for k := range field {
|
||||||
|
keys = append(keys, k)
|
||||||
|
}
|
||||||
|
|
||||||
|
sort.Strings(keys)
|
||||||
|
|
||||||
for i := 0; i < len(keys)-1; i++ {
|
for i := 0; i < len(keys)-1; i++ {
|
||||||
valUint, _ := strconv.ParseUint(keys[i], 10, 64)
|
valUint, _ := strconv.ParseUint(keys[i], 10, 64)
|
||||||
valUintNext, _ := strconv.ParseUint(keys[i+1], 10, 64)
|
valUintNext, _ := strconv.ParseUint(keys[i+1], 10, 64)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue