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

eth/dropper: remove unused field and make callbacks simpler

Browse source
This commit is contained in:
healthykim 2026-07-02 13:08:56 +02:00
parent ffb92fef99
commit 2d7ebc5e4f
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
eth/dropper.go
View file

@ -65,7 +65,6 @@ type getPeerStatsFunc func() map[string]txtracker.PeerStats
// protectionCategory defines a peer scoring function and the fraction of peers // protectionCategory defines a peer scoring function and the fraction of peers
// to protect per inbound/dialed category. Multiple categories are unioned. // to protect per inbound/dialed category. Multiple categories are unioned.
type protectionCategory struct { type protectionCategory struct {
name string
score func(txtracker.PeerStats) float64 score func(txtracker.PeerStats) float64
frac float64 // fraction of max peers to protect (0.0–1.0) frac float64 // fraction of max peers to protect (0.0–1.0)
} }
@ -73,8 +72,8 @@ type protectionCategory struct {
// protectionCategories is the list of protection criteria. Each category // protectionCategories is the list of protection criteria. Each category
// independently selects its top-N peers per pool; the union is protected. // independently selects its top-N peers per pool; the union is protected.
var protectionCategories = []protectionCategory{ var protectionCategories = []protectionCategory{
{"recent-finalized", func(s txtracker.PeerStats) float64 { return s.RecentFinalized }, inclusionProtectionFrac}, {func(s txtracker.PeerStats) float64 { return s.RecentFinalized }, inclusionProtectionFrac}, // Recent finalized
{"recent-included", func(s txtracker.PeerStats) float64 { return s.RecentIncluded }, inclusionProtectionFrac}, {func(s txtracker.PeerStats) float64 { return s.RecentIncluded }, inclusionProtectionFrac}, // Recent included
} }
// dropper monitors the state of the peer pool and introduces churn by // dropper monitors the state of the peer pool and introduces churn by
@ -232,27 +231,27 @@ func (cm *dropper) protectedPeers(peers []*p2p.Peer) map[*p2p.Peer]bool {
func protectedPeersByPool(inbound, dialed []*p2p.Peer, stats map[string]txtracker.PeerStats) map[*p2p.Peer]bool { func protectedPeersByPool(inbound, dialed []*p2p.Peer, stats map[string]txtracker.PeerStats) map[*p2p.Peer]bool {
result := make(map[*p2p.Peer]bool) result := make(map[*p2p.Peer]bool)
// protectPool selects the top-frac peers from pool by score and adds them to result. // protectPool selects the top-frac peers from pool by score and adds them to result.
protectPool := func(pool []*p2p.Peer, score func(*p2p.Peer) float64, frac float64) { protectPool := func(pool []*p2p.Peer, cat protectionCategory) {
n := int(float64(len(pool)) * frac) n := int(float64(len(pool)) * cat.frac)
if n == 0 { if n == 0 {
return return
} }
sorted := slices.SortedFunc(slices.Values(pool), func(a, b *p2p.Peer) int { sorted := slices.SortedFunc(slices.Values(pool), func(a, b *p2p.Peer) int {
return cmp.Compare(score(b), score(a)) // descending // descending
scoreB := cat.score(stats[b.ID().String()])
scoreA := cat.score(stats[a.ID().String()])
return cmp.Compare(scoreB, scoreA)
}) })
top := slices.DeleteFunc(sorted[:min(n, len(sorted))], func(p *p2p.Peer) bool { // select top n peers excluding 0
return score(p) <= 0 for _, p := range sorted[:min(n, len(sorted))] {
}) if cat.score(stats[p.ID().String()]) > 0 {
for _, p := range top {
result[p] = true result[p] = true
} }
} }
for _, cat := range protectionCategories {
score := func(p *p2p.Peer) float64 {
return cat.score(stats[p.ID().String()])
} }
protectPool(inbound, score, cat.frac) for _, cat := range protectionCategories {
protectPool(dialed, score, cat.frac) protectPool(inbound, cat)
protectPool(dialed, cat)
} }
return result return result
} }