op-node: Remove old band score metric.

op-node/flags/p2p_flags.go

@@ -35,13 +35,11 @@ var (
 		EnvVar:   p2pEnv("PEER_SCORING"),
 	}
 	PeerScoreBands = cli.StringFlag{
-		Name: "p2p.score.bands",
-		Usage: "Sets the peer score bands used primarily for peer score metrics. " +
-			"Should be provided in following format: <threshold>:<label>;<threshold>:<label>;..." +
-			"For example: -40:graylist;-20:restricted;0:nopx;20:friend;",
+		Name:     "p2p.score.bands",
+		Usage:    "Deprecated. This option is ignored and is only present for backwards compatibility.",
 		Required: false,
-		Value:    "-40:<=-40;-10:<=-10;-5:<=-05;-0.05:<=-00.05;0:<=0;0.05:<=00.05;5:<=05;10:<=10;20:<=20;100:>20;",
-		EnvVar:   p2pEnv("SCORE_BANDS"),
+		Value:    "",
+		Hidden:   true,
 	}
 
 	// Banning Flag - whether or not we want to act on the scoring

op-node/metrics/metrics.go

@@ -67,7 +67,7 @@ type Metricer interface {
 	Document() []metrics.DocumentedMetric
 	RecordChannelInputBytes(num int)
 	// P2P Metrics
-	SetPeerScores(scores map[string]float64, allScores []store.PeerScores)
+	SetPeerScores(allScores []store.PeerScores)
 	ClientPayloadByNumberEvent(num uint64, resultCode byte, duration time.Duration)
 	ServerPayloadByNumberEvent(num uint64, resultCode byte, duration time.Duration)
 	PayloadsQuarantineSize(n int)
@@ -133,16 +133,15 @@ type Metrics struct {
 	TransactionsSequencedTotal prometheus.Counter
 
 	// P2P Metrics
-	PeerCount           prometheus.Gauge
-	StreamCount         prometheus.Gauge
-	PeerScores          *prometheus.GaugeVec
-	GossipEventsTotal   *prometheus.CounterVec
-	BandwidthTotal      *prometheus.GaugeVec
-	PeerUnbans          prometheus.Counter
-	IPUnbans            prometheus.Counter
-	Dials               *prometheus.CounterVec
-	Accepts             *prometheus.CounterVec
-	PeerScoresHistogram *prometheus.HistogramVec
+	PeerCount         prometheus.Gauge
+	StreamCount       prometheus.Gauge
+	GossipEventsTotal *prometheus.CounterVec
+	BandwidthTotal    *prometheus.GaugeVec
+	PeerUnbans        prometheus.Counter
+	IPUnbans          prometheus.Counter
+	Dials             *prometheus.CounterVec
+	Accepts           *prometheus.CounterVec
+	PeerScores        *prometheus.HistogramVec
 
 	ChannelInputBytes prometheus.Counter
 
@@ -311,22 +310,9 @@ func NewMetrics(procName string) *Metrics {
 			Name:      "peer_count",
 			Help:      "Count of currently connected p2p peers",
 		}),
-		// Notice: We cannot use peer ids as [Labels] in the GaugeVec
-		// since peer ids would open a service attack vector.
-		// Each peer id would be a separate metric, flooding prometheus.
-		//
-		// [Labels]: https://prometheus.io/docs/practices/naming/#labels
-		PeerScores: factory.NewGaugeVec(prometheus.GaugeOpts{
+		PeerScores: factory.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: ns,
-			Subsystem: "p2p",
 			Name:      "peer_scores",
-			Help:      "Count of peer scores grouped by score",
-		}, []string{
-			"band",
-		}),
-		PeerScoresHistogram: factory.NewHistogramVec(prometheus.HistogramOpts{
-			Namespace: ns,
-			Name:      "peer_scores_histogram",
 			Help:      "Histogram of currrently connected peer scores",
 			Buckets:   []float64{-100, -40, -20, -10, -5, -2, -1, -0.5, -0.05, 0, 0.05, 0.5, 1, 2, 5, 10, 20, 40},
 		}, []string{"type"}),
@@ -459,20 +445,17 @@ func NewMetrics(procName string) *Metrics {
 	}
 }
 
-// SetPeerScores updates the peer score [prometheus.GaugeVec].
-// This takes a map of labels to scores.
-func (m *Metrics) SetPeerScores(scores map[string]float64, allScores []store.PeerScores) {
+// SetPeerScores updates the peer score metrics.
+// Accepts a slice of peer scores in any order.
+func (m *Metrics) SetPeerScores(allScores []store.PeerScores) {
 	for _, scores := range allScores {
-		m.PeerScoresHistogram.WithLabelValues("total").Observe(scores.Gossip.Total)
-		m.PeerScoresHistogram.WithLabelValues("ipColocation").Observe(scores.Gossip.IPColocationFactor)
-		m.PeerScoresHistogram.WithLabelValues("behavioralPenalty").Observe(scores.Gossip.BehavioralPenalty)
-		m.PeerScoresHistogram.WithLabelValues("blocksFirstMessage").Observe(scores.Gossip.Blocks.FirstMessageDeliveries)
-		m.PeerScoresHistogram.WithLabelValues("blocksTimeInMesh").Observe(scores.Gossip.Blocks.TimeInMesh)
-		m.PeerScoresHistogram.WithLabelValues("blocksMessageDeliveries").Observe(scores.Gossip.Blocks.MeshMessageDeliveries)
-		m.PeerScoresHistogram.WithLabelValues("blocksInvalidMessageDeliveries").Observe(scores.Gossip.Blocks.InvalidMessageDeliveries)
-	}
-	for label, score := range scores {
-		m.PeerScores.WithLabelValues(label).Set(score)
+		m.PeerScores.WithLabelValues("total").Observe(scores.Gossip.Total)
+		m.PeerScores.WithLabelValues("ipColocation").Observe(scores.Gossip.IPColocationFactor)
+		m.PeerScores.WithLabelValues("behavioralPenalty").Observe(scores.Gossip.BehavioralPenalty)
+		m.PeerScores.WithLabelValues("blocksFirstMessage").Observe(scores.Gossip.Blocks.FirstMessageDeliveries)
+		m.PeerScores.WithLabelValues("blocksTimeInMesh").Observe(scores.Gossip.Blocks.TimeInMesh)
+		m.PeerScores.WithLabelValues("blocksMessageDeliveries").Observe(scores.Gossip.Blocks.MeshMessageDeliveries)
+		m.PeerScores.WithLabelValues("blocksInvalidMessageDeliveries").Observe(scores.Gossip.Blocks.InvalidMessageDeliveries)
 	}
 }
 
@@ -803,7 +786,7 @@ func (n *noopMetricer) RecordSequencerReset() {
 func (n *noopMetricer) RecordGossipEvent(evType int32) {
 }
 
-func (n *noopMetricer) SetPeerScores(scores map[string]float64, allScores []store.PeerScores) {
+func (n *noopMetricer) SetPeerScores(allScores []store.PeerScores) {
 }
 
 func (n *noopMetricer) IncPeerCount() {

op-node/p2p/band_scorer_test.go

-package p2p
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-// TestBandScorer_ParseDefault tests the [BandScorer.Parse] function
-// on the default band scores cli flag value.
-func TestBandScorer_ParseDefault(t *testing.T) {
-	// Create a new band scorer.
-	bandScorer, err := NewBandScorer("-40:graylist;-20:restricted;0:nopx;20:friend;")
-	require.NoError(t, err)
-
-	// Validate the [BandScorer] internals.
-	require.ElementsMatch(t, bandScorer.bands, []scorePair{
-		{band: "graylist", threshold: -40},
-		{band: "restricted", threshold: -20},
-		{band: "nopx", threshold: 0},
-		{band: "friend", threshold: 20},
-	})
-}
-
-// TestBandScorer_BucketCorrectly tests the [BandScorer.Bucket] function
-// on a variety of scores.
-func TestBandScorer_BucketCorrectly(t *testing.T) {
-	// Create a new band scorer.
-	bandScorer, err := NewBandScorer("-40:graylist;-20:restricted;0:nopx;20:friend;")
-	require.NoError(t, err)
-
-	// Validate the [BandScorer] internals.
-	require.Equal(t, bandScorer.Bucket(-100), "graylist")
-	require.Equal(t, bandScorer.Bucket(-40), "graylist")
-	require.Equal(t, bandScorer.Bucket(-39), "restricted")
-	require.Equal(t, bandScorer.Bucket(-20), "restricted")
-	require.Equal(t, bandScorer.Bucket(-19), "nopx")
-	require.Equal(t, bandScorer.Bucket(0), "nopx")
-	require.Equal(t, bandScorer.Bucket(1), "friend")
-	require.Equal(t, bandScorer.Bucket(20), "friend")
-	require.Equal(t, bandScorer.Bucket(21), "friend")
-}
-
-// TestBandScorer_BucketInverted tests the [BandScorer.Bucket] function
-// on a variety of scores, in descending order.
-func TestBandScorer_BucketInverted(t *testing.T) {
-	// Create a new band scorer.
-	bandScorer, err := NewBandScorer("20:friend;0:nopx;-20:restricted;-40:graylist;")
-	require.NoError(t, err)
-
-	// Validate the [BandScorer] internals.
-	require.Equal(t, bandScorer.Bucket(-100), "graylist")
-	require.Equal(t, bandScorer.Bucket(-40), "graylist")
-	require.Equal(t, bandScorer.Bucket(-39), "restricted")
-	require.Equal(t, bandScorer.Bucket(-20), "restricted")
-	require.Equal(t, bandScorer.Bucket(-19), "nopx")
-	require.Equal(t, bandScorer.Bucket(0), "nopx")
-	require.Equal(t, bandScorer.Bucket(1), "friend")
-	require.Equal(t, bandScorer.Bucket(20), "friend")
-	require.Equal(t, bandScorer.Bucket(21), "friend")
-}
-
-// TestBandScorer_ParseEmpty tests the [BandScorer.Parse] function
-// on an empty string.
-func TestBandScorer_ParseEmpty(t *testing.T) {
-	// Create a band scorer on an empty string.
-	bandScorer, err := NewBandScorer("")
-	require.NoError(t, err)
-
-	// Validate the [BandScorer] internals.
-	require.Len(t, bandScorer.bands, 0)
-}
-
-// TestBandScorer_ParseWhitespace tests the [BandScorer.Parse] function
-// on a variety of whitespaced strings.
-func TestBandScorer_ParseWhitespace(t *testing.T) {
-	// Create a band scorer on an empty string.
-	bandScorer, err := NewBandScorer("  ;  ;  ;  ")
-	require.NoError(t, err)
-
-	// Validate the [BandScorer] internals.
-	require.Len(t, bandScorer.bands, 0)
-}

op-node/p2p/cli/load_config.go

@@ -58,10 +58,6 @@ func NewConfig(ctx *cli.Context, blockTime uint64) (*p2p.Config, error) {
 		return nil, fmt.Errorf("failed to load p2p peer scoring options: %w", err)
 	}
 
-	if err := loadPeerScoreBands(conf, ctx); err != nil {
-		return nil, fmt.Errorf("failed to load p2p peer score bands: %w", err)
-	}
-
 	if err := loadBanningOptions(conf, ctx); err != nil {
 		return nil, fmt.Errorf("failed to load banning option: %w", err)
 	}
@@ -124,17 +120,6 @@ func loadPeerScoringParams(conf *p2p.Config, ctx *cli.Context, blockTime uint64)
 	return nil
 }
 
-// loadPeerScoreBands loads [p2p.BandScorer] from the CLI context.
-func loadPeerScoreBands(conf *p2p.Config, ctx *cli.Context) error {
-	scoreBands := ctx.GlobalString(flags.PeerScoreBands.Name)
-	bandScorer, err := p2p.NewBandScorer(scoreBands)
-	if err != nil {
-		return err
-	}
-	conf.BandScoreThresholds = *bandScorer
-	return nil
-}
-
 // loadBanningOptions loads whether or not to ban peers from the CLI context.
 func loadBanningOptions(conf *p2p.Config, ctx *cli.Context) error {
 	conf.BanningEnabled = ctx.GlobalBool(flags.Banning.Name)

op-node/p2p/config.go

@@ -47,7 +47,6 @@ type SetupP2P interface {
 	BanPeers() bool
 	BanThreshold() float64
 	BanDuration() time.Duration
-	PeerBandScorer() *BandScoreThresholds
 	GossipSetupConfigurables
 	ReqRespSyncEnabled() bool
 }
@@ -67,9 +66,6 @@ type Config struct {
 	PeerScoring  pubsub.PeerScoreParams
 	TopicScoring pubsub.TopicScoreParams
 
-	// Peer Score Band Thresholds
-	BandScoreThresholds BandScoreThresholds
-
 	// Whether to ban peers based on their [PeerScoring] score. Should be negative.
 	BanningEnabled bool
 	// Minimum score before peers are disconnected and banned
@@ -142,10 +138,6 @@ func (conf *Config) PeerScoringParams() *pubsub.PeerScoreParams {
 	return &conf.PeerScoring
 }
 
-func (conf *Config) PeerBandScorer() *BandScoreThresholds {
-	return &conf.BandScoreThresholds
-}
-
 func (conf *Config) BanPeers() bool {
 	return conf.BanningEnabled
 }

op-node/p2p/mocks/ScoreMetrics.go

@@ -13,9 +13,9 @@ type ScoreMetrics struct {
 	mock.Mock
 }
 
-// SetPeerScores provides a mock function with given fields: _a0, _a1
-func (_m *ScoreMetrics) SetPeerScores(_a0 map[string]float64, _a1 []store.PeerScores) {
-	_m.Called(_a0, _a1)
+// SetPeerScores provides a mock function with given fields: _a0
+func (_m *ScoreMetrics) SetPeerScores(_a0 []store.PeerScores) {
+	_m.Called(_a0)
 }
 
 type mockConstructorTestingTNewScoreMetrics interface {

op-node/p2p/monitor/mocks/PeerManager.go

@@ -118,7 +118,7 @@ func (_c *PeerManager_GetPeerScore_Call) RunAndReturn(run func(peer.ID) (float64
 	return _c
 }
 
-// IsProtected provides a mock function with given fields: _a0
+// IsStatic provides a mock function with given fields: _a0
 func (_m *PeerManager) IsStatic(_a0 peer.ID) bool {
 	ret := _m.Called(_a0)
 
@@ -132,30 +132,30 @@ func (_m *PeerManager) IsStatic(_a0 peer.ID) bool {
 	return r0
 }
 
-// PeerManager_IsProtected_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'IsStatic'
-type PeerManager_IsProtected_Call struct {
+// PeerManager_IsStatic_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'IsStatic'
+type PeerManager_IsStatic_Call struct {
 	*mock.Call
 }
 
-// IsProtected is a helper method to define mock.On call
+// IsStatic is a helper method to define mock.On call
 //   - _a0 peer.ID
-func (_e *PeerManager_Expecter) IsProtected(_a0 interface{}) *PeerManager_IsProtected_Call {
-	return &PeerManager_IsProtected_Call{Call: _e.mock.On("IsStatic", _a0)}
+func (_e *PeerManager_Expecter) IsStatic(_a0 interface{}) *PeerManager_IsStatic_Call {
+	return &PeerManager_IsStatic_Call{Call: _e.mock.On("IsStatic", _a0)}
 }
 
-func (_c *PeerManager_IsProtected_Call) Run(run func(_a0 peer.ID)) *PeerManager_IsProtected_Call {
+func (_c *PeerManager_IsStatic_Call) Run(run func(_a0 peer.ID)) *PeerManager_IsStatic_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		run(args[0].(peer.ID))
 	})
 	return _c
 }
 
-func (_c *PeerManager_IsProtected_Call) Return(_a0 bool) *PeerManager_IsProtected_Call {
+func (_c *PeerManager_IsStatic_Call) Return(_a0 bool) *PeerManager_IsStatic_Call {
 	_c.Call.Return(_a0)
 	return _c
 }
 
-func (_c *PeerManager_IsProtected_Call) RunAndReturn(run func(peer.ID) bool) *PeerManager_IsProtected_Call {
+func (_c *PeerManager_IsStatic_Call) RunAndReturn(run func(peer.ID) bool) *PeerManager_IsStatic_Call {
 	_c.Call.Return(run)
 	return _c
 }

op-node/p2p/monitor/peer_monitor_test.go

@@ -96,7 +96,7 @@ func TestCheckNextPeer(t *testing.T) {
 		id := peerIDs[0]
 		manager.EXPECT().Peers().Return(peerIDs).Once()
 		manager.EXPECT().GetPeerScore(id).Return(-101, nil).Once()
-		manager.EXPECT().IsProtected(id).Return(false).Once()
+		manager.EXPECT().IsStatic(id).Return(false).Once()
 		manager.EXPECT().BanPeer(id, clock.Now().Add(testBanDuration)).Return(nil).Once()
 
 		require.NoError(t, monitor.checkNextPeer())
@@ -107,7 +107,7 @@ func TestCheckNextPeer(t *testing.T) {
 		id := peerIDs[0]
 		manager.EXPECT().Peers().Return(peerIDs).Once()
 		manager.EXPECT().GetPeerScore(id).Return(-101, nil).Once()
-		manager.EXPECT().IsProtected(id).Return(true)
+		manager.EXPECT().IsStatic(id).Return(true)
 
 		require.NoError(t, monitor.checkNextPeer())
 	})

op-node/p2p/node.go

@@ -117,7 +117,7 @@ func (n *NodeP2P) init(resourcesCtx context.Context, rollupCfg *rollup.Config, l
 			return fmt.Errorf("cannot init without extended peerstore: %w", err)
 		}
 		n.store = eps
-		n.scorer = NewScorer(rollupCfg, eps, metrics, setup.PeerBandScorer(), log)
+		n.scorer = NewScorer(rollupCfg, eps, metrics, log)
 		n.host.Network().Notify(&network.NotifyBundle{
 			ConnectedF: func(_ network.Network, conn network.Conn) {
 				n.scorer.OnConnect(conn.RemotePeer())

op-node/p2p/peer_scorer.go

 package p2p
 
 import (
-	"fmt"
-	"sort"
-	"strconv"
-	"strings"
 	"time"
 
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
@@ -16,72 +12,10 @@ import (
 )
 
 type scorer struct {
-	peerStore           Peerstore
-	metricer            ScoreMetrics
-	log                 log.Logger
-	bandScoreThresholds *BandScoreThresholds
-	cfg                 *rollup.Config
-}
-
-// scorePair holds a band and its corresponding threshold.
-type scorePair struct {
-	band      string
-	threshold float64
-}
-
-// BandScoreThresholds holds the thresholds for classifying peers
-// into different score bands.
-type BandScoreThresholds struct {
-	bands []scorePair
-}
-
-// NewBandScorer constructs a new [BandScoreThresholds] instance.
-func NewBandScorer(str string) (*BandScoreThresholds, error) {
-	s := &BandScoreThresholds{
-		bands: make([]scorePair, 0),
-	}
-
-	for _, band := range strings.Split(str, ";") {
-		// Skip empty band strings.
-		band := strings.TrimSpace(band)
-		if band == "" {
-			continue
-		}
-		split := strings.Split(band, ":")
-		if len(split) != 2 {
-			return nil, fmt.Errorf("invalid score band: %s", band)
-		}
-		threshold, err := strconv.ParseFloat(split[0], 64)
-		if err != nil {
-			return nil, err
-		}
-		s.bands = append(s.bands, scorePair{
-			band:      split[1],
-			threshold: threshold,
-		})
-	}
-
-	// Order the bands by threshold in ascending order.
-	sort.Slice(s.bands, func(i, j int) bool {
-		return s.bands[i].threshold < s.bands[j].threshold
-	})
-
-	return s, nil
-}
-
-// Bucket returns the appropriate band for a given score.
-func (s *BandScoreThresholds) Bucket(score float64) string {
-	for _, pair := range s.bands {
-		if score <= pair.threshold {
-			return pair.band
-		}
-	}
-	// If there is no band threshold higher than the score,
-	// the peer must be placed in the highest bucket.
-	if len(s.bands) > 0 {
-		return s.bands[len(s.bands)-1].band
-	}
-	return ""
+	peerStore Peerstore
+	metricer  ScoreMetrics
+	log       log.Logger
+	cfg       *rollup.Config
 }
 
 // Peerstore is a subset of the libp2p peerstore.Peerstore interface.
@@ -108,17 +42,16 @@ type Scorer interface {
 
 //go:generate mockery --name ScoreMetrics --output mocks/
 type ScoreMetrics interface {
-	SetPeerScores(map[string]float64, []store.PeerScores)
+	SetPeerScores([]store.PeerScores)
 }
 
 // NewScorer returns a new peer scorer.
-func NewScorer(cfg *rollup.Config, peerStore Peerstore, metricer ScoreMetrics, bandScoreThresholds *BandScoreThresholds, log log.Logger) Scorer {
+func NewScorer(cfg *rollup.Config, peerStore Peerstore, metricer ScoreMetrics, log log.Logger) Scorer {
 	return &scorer{
-		peerStore:           peerStore,
-		metricer:            metricer,
-		log:                 log,
-		bandScoreThresholds: bandScoreThresholds,
-		cfg:                 cfg,
+		peerStore: peerStore,
+		metricer:  metricer,
+		log:       log,
+		cfg:       cfg,
 	}
 }
 
@@ -129,12 +62,7 @@ func NewScorer(cfg *rollup.Config, peerStore Peerstore, metricer ScoreMetrics, b
 func (s *scorer) SnapshotHook() pubsub.ExtendedPeerScoreInspectFn {
 	blocksTopicName := blocksTopicV1(s.cfg)
 	return func(m map[peer.ID]*pubsub.PeerScoreSnapshot) {
-		scoreMap := make(map[string]float64)
 		allScores := make([]store.PeerScores, 0, len(m))
-		// Zero out all bands.
-		for _, b := range s.bandScoreThresholds.bands {
-			scoreMap[b.band] = 0
-		}
 		// Now set the new scores.
 		for id, snap := range m {
 			diff := store.GossipScores{
@@ -155,11 +83,7 @@ func (s *scorer) SnapshotHook() pubsub.ExtendedPeerScoreInspectFn {
 				allScores = append(allScores, peerScores)
 			}
 		}
-		for _, snap := range m {
-			band := s.bandScoreThresholds.Bucket(snap.Score)
-			scoreMap[band] += 1
-		}
-		s.metricer.SetPeerScores(scoreMap, allScores)
+		s.metricer.SetPeerScores(allScores)
 	}
 }
 

op-node/p2p/peer_scorer_test.go

@@ -23,7 +23,6 @@ type PeerScorerTestSuite struct {
 
 	mockStore    *p2pMocks.Peerstore
 	mockMetricer *p2pMocks.ScoreMetrics
-	bandScorer   *p2p.BandScoreThresholds
 	logger       log.Logger
 }
 
@@ -31,9 +30,6 @@ type PeerScorerTestSuite struct {
 func (testSuite *PeerScorerTestSuite) SetupTest() {
 	testSuite.mockStore = &p2pMocks.Peerstore{}
 	testSuite.mockMetricer = &p2pMocks.ScoreMetrics{}
-	bandScorer, err := p2p.NewBandScorer("-40:graylist;0:friend;")
-	testSuite.NoError(err)
-	testSuite.bandScorer = bandScorer
 	testSuite.logger = testlog.Logger(testSuite.T(), log.LvlError)
 }
 
@@ -48,7 +44,6 @@ func (testSuite *PeerScorerTestSuite) TestScorer_OnConnect() {
 		&rollup.Config{L2ChainID: big.NewInt(123)},
 		testSuite.mockStore,
 		testSuite.mockMetricer,
-		testSuite.bandScorer,
 		testSuite.logger,
 	)
 	scorer.OnConnect(peer.ID("alice"))
@@ -60,7 +55,6 @@ func (testSuite *PeerScorerTestSuite) TestScorer_OnDisconnect() {
 		&rollup.Config{L2ChainID: big.NewInt(123)},
 		testSuite.mockStore,
 		testSuite.mockMetricer,
-		testSuite.bandScorer,
 		testSuite.logger,
 	)
 	scorer.OnDisconnect(peer.ID("alice"))
@@ -72,20 +66,16 @@ func (testSuite *PeerScorerTestSuite) TestScorer_SnapshotHook() {
 		&rollup.Config{L2ChainID: big.NewInt(123)},
 		testSuite.mockStore,
 		testSuite.mockMetricer,
-		testSuite.bandScorer,
 		testSuite.logger,
 	)
 	inspectFn := scorer.SnapshotHook()
 
-	scores := store.PeerScores{}
+	scores := store.PeerScores{Gossip: store.GossipScores{Total: 3}}
 	// Expect updating the peer store
 	testSuite.mockStore.On("SetScore", peer.ID("peer1"), &store.GossipScores{Total: float64(-100)}).Return(scores, nil).Once()
 
 	// The metricer should then be called with the peer score band map
-	testSuite.mockMetricer.On("SetPeerScores", map[string]float64{
-		"friend":   0,
-		"graylist": 1,
-	}, []store.PeerScores{scores}).Return(nil).Once()
+	testSuite.mockMetricer.On("SetPeerScores", []store.PeerScores{scores}).Return(nil).Once()
 
 	// Apply the snapshot
 	snapshotMap := map[peer.ID]*pubsub.PeerScoreSnapshot{
@@ -99,10 +89,7 @@ func (testSuite *PeerScorerTestSuite) TestScorer_SnapshotHook() {
 	testSuite.mockStore.On("SetScore", peer.ID("peer1"), &store.GossipScores{Total: 0}).Return(scores, nil).Once()
 
 	// The metricer should then be called with the peer score band map
-	testSuite.mockMetricer.On("SetPeerScores", map[string]float64{
-		"friend":   1,
-		"graylist": 0,
-	}, []store.PeerScores{scores}).Return(nil).Once()
+	testSuite.mockMetricer.On("SetPeerScores", []store.PeerScores{scores}).Return(nil).Once()
 
 	// Apply the snapshot
 	snapshotMap = map[peer.ID]*pubsub.PeerScoreSnapshot{

op-node/p2p/peer_scores_test.go

@@ -37,7 +37,6 @@ type PeerScoresTestSuite struct {
 
 	mockStore    *p2pMocks.Peerstore
 	mockMetricer *p2pMocks.ScoreMetrics
-	bandScorer   BandScoreThresholds
 	logger       log.Logger
 }
 
@@ -45,9 +44,6 @@ type PeerScoresTestSuite struct {
 func (testSuite *PeerScoresTestSuite) SetupTest() {
 	testSuite.mockStore = &p2pMocks.Peerstore{}
 	testSuite.mockMetricer = &p2pMocks.ScoreMetrics{}
-	bandScorer, err := NewBandScorer("0:graylist;")
-	testSuite.NoError(err)
-	testSuite.bandScorer = *bandScorer
 	testSuite.logger = testlog.Logger(testSuite.T(), log.LvlError)
 }
 
@@ -104,9 +100,8 @@ func newGossipSubs(testSuite *PeerScoresTestSuite, ctx context.Context, hosts []
 
 		scorer := NewScorer(
 			&rollup.Config{L2ChainID: big.NewInt(123)},
-			extPeerStore, testSuite.mockMetricer, &testSuite.bandScorer, logger)
+			extPeerStore, testSuite.mockMetricer, logger)
 		opts = append(opts, ConfigurePeerScoring(&Config{
-			BandScoreThresholds: testSuite.bandScorer,
 			PeerScoring: pubsub.PeerScoreParams{
 				AppSpecificScore: func(p peer.ID) float64 {
 					if p == hosts[0].ID() {

op-node/p2p/prepared.go

@@ -73,10 +73,6 @@ func (p *Prepared) PeerScoringParams() *pubsub.PeerScoreParams {
 	return nil
 }
 
-func (p *Prepared) PeerBandScorer() *BandScoreThresholds {
-	return nil
-}
-
 func (p *Prepared) BanPeers() bool {
 	return false
 }