From 6db2a1a072bb9fee41a743f53c126b2ab16cd851 Mon Sep 17 00:00:00 2001 From: amirylm Date: Thu, 16 Nov 2023 22:36:45 -0300 Subject: [PATCH] small alignments --- core/gossip/params.go | 37 +++++++++++++++++++------------------ core/gossip/scoring.go | 3 ++- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/core/gossip/params.go b/core/gossip/params.go index ff3f091..c25f31f 100644 --- a/core/gossip/params.go +++ b/core/gossip/params.go @@ -5,34 +5,35 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" ) -func GossipSubParams(overlayp *commons.OverlayParams) pubsub.GossipSubParams { +// GossipSubParams returns the default pubsub.GossipSubParams parameters, +// overriden by the given overlay parameters. +func GossipSubParams(overlayParams *commons.OverlayParams) pubsub.GossipSubParams { gsCfg := pubsub.DefaultGossipSubParams() - var overlay commons.OverlayParams - if overlayp != nil { - overlay = *overlayp + if overlayParams == nil { + return gsCfg } - if overlay.D > 0 { - gsCfg.D = int(overlay.D) + if overlayParams.D > 0 { + gsCfg.D = int(overlayParams.D) } - if overlay.Dlow > 0 { - gsCfg.Dlo = int(overlay.Dlow) + if overlayParams.Dlow > 0 { + gsCfg.Dlo = int(overlayParams.Dlow) } - if overlay.Dhi > 0 { - gsCfg.Dhi = int(overlay.Dhi) + if overlayParams.Dhi > 0 { + gsCfg.Dhi = int(overlayParams.Dhi) } - if overlay.Dlazy > 0 { - gsCfg.Dlazy = int(overlay.Dlazy) + if overlayParams.Dlazy > 0 { + gsCfg.Dlazy = int(overlayParams.Dlazy) } - if overlay.McacheGossip > 0 { - gsCfg.MaxIHaveMessages = int(overlay.McacheGossip) + if overlayParams.McacheGossip > 0 { + gsCfg.MaxIHaveMessages = int(overlayParams.McacheGossip) } - if overlay.McacheLen > 0 { - gsCfg.MaxIHaveLength = int(overlay.McacheLen) + if overlayParams.McacheLen > 0 { + gsCfg.MaxIHaveLength = int(overlayParams.McacheLen) } - if fanoutTtl := overlay.FanoutTtl; fanoutTtl.Milliseconds() > 0 { + if fanoutTtl := overlayParams.FanoutTtl; fanoutTtl.Milliseconds() > 0 { gsCfg.FanoutTTL = fanoutTtl } - if heartbeat := overlay.HeartbeatInterval; heartbeat.Milliseconds() > 0 { + if heartbeat := overlayParams.HeartbeatInterval; heartbeat.Milliseconds() > 0 { gsCfg.HeartbeatInterval = heartbeat } return gsCfg diff --git a/core/gossip/scoring.go b/core/gossip/scoring.go index 4aa1d4f..79439d6 100644 --- a/core/gossip/scoring.go +++ b/core/gossip/scoring.go @@ -9,9 +9,10 @@ func PeerScores(cfg commons.PubsubConfig) (*pubsub.PeerScoreParams, *pubsub.Peer peerScores, thresholds := &pubsub.PeerScoreParams{}, &pubsub.PeerScoreThresholds{ // TODO: using reasonable defaults, requires tuning SkipAtomicValidation: true, - GossipThreshold: -10000, + GossipThreshold: -4000, PublishThreshold: -2000, GraylistThreshold: -400, + // OpportunisticGraftThreshold: 10, } if cfg.Scoring != nil { s, t := cfg.Scoring.ToStd()