forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-15 04:26:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

simplify rand usage

Browse source 
Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com>
This commit is contained in:
Csaba Kiraly 2025-04-10 09:48:27 +02:00
parent 42d2c9b588
commit e9065acdde
No known key found for this signature in database
GPG key ID: 0FE274EE8C95166E
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
eth/dropper.go
View file

@ -17,8 +17,6 @@
package eth package eth
import ( import (
crand "crypto/rand"
"encoding/binary"
mrand "math/rand" mrand "math/rand"
"slices" "slices"
"sync" "sync"
@ -80,7 +78,6 @@ type dropperConfig struct {
maxInboundPeers int // maximum number of inbound peers maxInboundPeers int // maximum number of inbound peers
log log.Logger log log.Logger
clock mclock.Clock clock mclock.Clock
rand *mrand.Rand
} }
func (cfg dropperConfig) withDefaults() dropperConfig { func (cfg dropperConfig) withDefaults() dropperConfig {
@ -90,12 +87,6 @@ func (cfg dropperConfig) withDefaults() dropperConfig {
if cfg.clock == nil { if cfg.clock == nil {
cfg.clock = mclock.System{} cfg.clock = mclock.System{}
} }
if cfg.rand == nil {
seedb := make([]byte, 8)
crand.Read(seedb)
seed := int64(binary.BigEndian.Uint64(seedb))
cfg.rand = mrand.New(mrand.NewSource(seed))
}
return cfg return cfg
} }
@ -162,7 +153,7 @@ func (cm *dropper) dropRandomPeer(dialed bool) bool {
} }
droppable := slices.DeleteFunc(peers, selectDoNotDrop) droppable := slices.DeleteFunc(peers, selectDoNotDrop)
if len(droppable) > 0 { if len(droppable) > 0 {
p := droppable[cm.rand.Intn(len(droppable))] p := droppable[mrand.Intn(len(droppable))]
cm.log.Debug("dropping random peer", "id", p.ID(), "duration", common.PrettyDuration(p.Lifetime()), cm.log.Debug("dropping random peer", "id", p.ID(), "duration", common.PrettyDuration(p.Lifetime()),
"dialed", dialed, "peercountbefore", len(peers)) "dialed", dialed, "peercountbefore", len(peers))
p.Disconnect(p2p.DiscTooManyPeers) p.Disconnect(p2p.DiscTooManyPeers)
@ -172,14 +163,11 @@ func (cm *dropper) dropRandomPeer(dialed bool) bool {
} }
// randomDuration generates a random duration between min and max. // randomDuration generates a random duration between min and max.
// TODO: maybe we should move this to a common utlity package. func randomDuration(min, max time.Duration) time.Duration {
// TODO: panic might be too harsh, maybe return an error.
func randomDuration(rand *mrand.Rand, min, max time.Duration) time.Duration {
if min > max { if min > max {
panic("min duration must be less than or equal to max duration") panic("min duration must be less than or equal to max duration")
} }
nanos := rand.Int63n(max.Nanoseconds()-min.Nanoseconds()) + min.Nanoseconds() return time.Duration(mrand.Int63n(int64(max-min)) + int64(min))
return time.Duration(nanos)
} }
// updatePeerDropTimers checks and starts/stops the timer for peer drop. // updatePeerDropTimers checks and starts/stops the timer for peer drop.
@ -192,14 +180,14 @@ func (cm *dropper) updatePeerDropTimers(syncing bool) {
if !syncing { if !syncing {
// If a drop was already scheduled, Schedule does nothing. // If a drop was already scheduled, Schedule does nothing.
if cm.maxDialPeers-numDialed <= peerDropThreshold { if cm.maxDialPeers-numDialed <= peerDropThreshold {
interval := randomDuration(cm.rand, peerDropIntervalMin, peerDropIntervalMax) interval := randomDuration(peerDropIntervalMin, peerDropIntervalMax)
cm.peerDropDialedTimer.Schedule(cm.clock.Now().Add(interval)) cm.peerDropDialedTimer.Schedule(cm.clock.Now().Add(interval))
} else { } else {
cm.peerDropDialedTimer.Stop() cm.peerDropDialedTimer.Stop()
} }
if cm.maxInboundPeers-numInbound <= peerDropThreshold { if cm.maxInboundPeers-numInbound <= peerDropThreshold {
interval := randomDuration(cm.rand, peerDropIntervalMin, peerDropIntervalMax) interval := randomDuration(peerDropIntervalMin, peerDropIntervalMax)
cm.peerDropInboundTimer.Schedule(cm.clock.Now().Add(interval)) cm.peerDropInboundTimer.Schedule(cm.clock.Now().Add(interval))
} else { } else {
cm.peerDropInboundTimer.Stop() cm.peerDropInboundTimer.Stop()