remove band scorer mock ⚙

op-node/p2p/mocks/BandScorer.go

-// Code generated by mockery v2.22.1. DO NOT EDIT.
-
-package mocks
-
-import mock "github.com/stretchr/testify/mock"
-
-// BandScorer is an autogenerated mock type for the BandScorer type
-type BandScorer struct {
-	mock.Mock
-}
-
-// Bucket provides a mock function with given fields: score
-func (_m *BandScorer) Bucket(score float64) string {
-	ret := _m.Called(score)
-
-	var r0 string
-	if rf, ok := ret.Get(0).(func(float64) string); ok {
-		r0 = rf(score)
-	} else {
-		r0 = ret.Get(0).(string)
-	}
-
-	return r0
-}
-
-// Parse provides a mock function with given fields: str
-func (_m *BandScorer) Parse(str string) error {
-	ret := _m.Called(str)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(string) error); ok {
-		r0 = rf(str)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// Reset provides a mock function with given fields:
-func (_m *BandScorer) Reset() {
-	_m.Called()
-}
-
-type mockConstructorTestingTNewBandScorer interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewBandScorer creates a new instance of BandScorer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewBandScorer(t mockConstructorTestingTNewBandScorer) *BandScorer {
-	mock := &BandScorer{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}

op-node/p2p/peer_scorer.go

@@ -19,6 +19,7 @@ type scorer struct {
 	bandScoreThresholds BandScorer
 }
 
+// scorePair holds a band and its corresponding threshold.
 type scorePair struct {
 	band      string
 	threshold float64
@@ -36,8 +37,6 @@ type BandScoreThresholds struct {
 // Implementations are expected to construct internals using the
 // [Parse] function and then expose the [Bucket] function for
 // downstream [BandScorer] consumers.
-//
-//go:generate mockery --name BandScorer --output mocks/
 type BandScorer interface {
 	Parse(str string) error
 	Bucket(score float64) string

op-node/p2p/peer_scorer_test.go

@@ -17,11 +17,11 @@ type PeerScorerTestSuite struct {
 	suite.Suite
 
 	// mockConnGater *p2pMocks.ConnectionGater
-	mockGater      *p2pMocks.PeerGater
-	mockStore      *p2pMocks.Peerstore
-	mockMetricer   *p2pMocks.GossipMetricer
-	mockBandScorer *p2pMocks.BandScorer
-	logger         log.Logger
+	mockGater    *p2pMocks.PeerGater
+	mockStore    *p2pMocks.Peerstore
+	mockMetricer *p2pMocks.GossipMetricer
+	bandScorer   p2p.BandScorer
+	logger       log.Logger
 }
 
 // SetupTest sets up the test suite.
@@ -29,7 +29,8 @@ func (testSuite *PeerScorerTestSuite) SetupTest() {
 	testSuite.mockGater = &p2pMocks.PeerGater{}
 	testSuite.mockStore = &p2pMocks.Peerstore{}
 	testSuite.mockMetricer = &p2pMocks.GossipMetricer{}
-	testSuite.mockBandScorer = &p2pMocks.BandScorer{}
+	testSuite.bandScorer = &p2p.BandScoreThresholds{}
+	testSuite.NoError(testSuite.bandScorer.Parse("0:graylist;"))
 	testSuite.logger = testlog.Logger(testSuite.T(), log.LvlError)
 }
 
@@ -38,45 +39,41 @@ func TestPeerScorer(t *testing.T) {
 	suite.Run(t, new(PeerScorerTestSuite))
 }
 
-// TestPeerScorerOnConnect ensures we can call the OnConnect method on the peer scorer.
-func (testSuite *PeerScorerTestSuite) TestPeerScorerOnConnect() {
+// TestScorer_OnConnect ensures we can call the OnConnect method on the peer scorer.
+func (testSuite *PeerScorerTestSuite) TestScorer_OnConnect() {
 	scorer := p2p.NewScorer(
 		testSuite.mockGater,
 		testSuite.mockStore,
 		testSuite.mockMetricer,
-		testSuite.mockBandScorer,
+		testSuite.bandScorer,
 		testSuite.logger,
 	)
 	scorer.OnConnect()
 }
 
-// TestPeerScorerOnDisconnect ensures we can call the OnDisconnect method on the peer scorer.
-func (testSuite *PeerScorerTestSuite) TestPeerScorerOnDisconnect() {
+// TestScorer_OnDisconnect ensures we can call the OnDisconnect method on the peer scorer.
+func (testSuite *PeerScorerTestSuite) TestScorer_OnDisconnect() {
 	scorer := p2p.NewScorer(
 		testSuite.mockGater,
 		testSuite.mockStore,
 		testSuite.mockMetricer,
-		testSuite.mockBandScorer,
+		testSuite.bandScorer,
 		testSuite.logger,
 	)
 	scorer.OnDisconnect()
 }
 
-// TestSnapshotHook tests running the snapshot hook on the peer scorer.
-func (testSuite *PeerScorerTestSuite) TestSnapshotHook() {
+// TestScorer_SnapshotHook tests running the snapshot hook on the peer scorer.
+func (testSuite *PeerScorerTestSuite) TestScorer_SnapshotHook() {
 	scorer := p2p.NewScorer(
 		testSuite.mockGater,
 		testSuite.mockStore,
 		testSuite.mockMetricer,
-		testSuite.mockBandScorer,
+		testSuite.bandScorer,
 		testSuite.logger,
 	)
 	inspectFn := scorer.SnapshotHook()
 
-	// Mock the band scorer calls
-	testSuite.mockBandScorer.On("Reset").Return(nil)
-	testSuite.mockBandScorer.On("Bucket", float64(-100)).Return("graylist")
-
 	// Mock the peer gater call
 	testSuite.mockGater.On("Update", peer.ID("peer1"), float64(-100)).Return(nil)
 
@@ -94,22 +91,18 @@ func (testSuite *PeerScorerTestSuite) TestSnapshotHook() {
 	inspectFn(snapshotMap)
 }
 
-// TestSnapshotHookBlockPeer tests running the snapshot hook on the peer scorer with a peer score below the threshold.
+// TestScorer_SnapshotHookBlocksPeer tests running the snapshot hook on the peer scorer with a peer score below the threshold.
 // This implies that the peer should be blocked.
-func (testSuite *PeerScorerTestSuite) TestSnapshotHookBlockPeer() {
+func (testSuite *PeerScorerTestSuite) TestScorer_SnapshotHookBlocksPeer() {
 	scorer := p2p.NewScorer(
 		testSuite.mockGater,
 		testSuite.mockStore,
 		testSuite.mockMetricer,
-		testSuite.mockBandScorer,
+		testSuite.bandScorer,
 		testSuite.logger,
 	)
 	inspectFn := scorer.SnapshotHook()
 
-	// Mock the band scorer calls
-	testSuite.mockBandScorer.On("Reset").Return(nil)
-	testSuite.mockBandScorer.On("Bucket", float64(-101)).Return("graylist")
-
 	// Mock the peer gater call
 	testSuite.mockGater.On("Update", peer.ID("peer1"), float64(-101)).Return(nil)
 

op-node/p2p/peer_scores_test.go

@@ -27,11 +27,11 @@ import (
 type PeerScoresTestSuite struct {
 	suite.Suite
 
-	mockGater      *p2pMocks.ConnectionGater
-	mockStore      *p2pMocks.Peerstore
-	mockMetricer   *p2pMocks.GossipMetricer
-	mockBandScorer *p2pMocks.BandScorer
-	logger         log.Logger
+	mockGater    *p2pMocks.ConnectionGater
+	mockStore    *p2pMocks.Peerstore
+	mockMetricer *p2pMocks.GossipMetricer
+	bandScorer   p2p.BandScorer
+	logger       log.Logger
 }
 
 // SetupTest sets up the test suite.
@@ -39,7 +39,8 @@ func (testSuite *PeerScoresTestSuite) SetupTest() {
 	testSuite.mockGater = &p2pMocks.ConnectionGater{}
 	testSuite.mockStore = &p2pMocks.Peerstore{}
 	testSuite.mockMetricer = &p2pMocks.GossipMetricer{}
-	testSuite.mockBandScorer = &p2pMocks.BandScorer{}
+	testSuite.bandScorer = &p2p.BandScoreThresholds{}
+	testSuite.NoError(testSuite.bandScorer.Parse("0:graylist;"))
 	testSuite.logger = testlog.Logger(testSuite.T(), log.LvlError)
 }
 
@@ -70,7 +71,7 @@ func newGossipSubs(testSuite *PeerScoresTestSuite, ctx context.Context, hosts []
 		rt := pubsub.DefaultGossipSubRouter(h)
 		opts := []pubsub.Option{}
 		opts = append(opts, p2p.ConfigurePeerScoring(h, testSuite.mockGater, &p2p.Config{
-			BandScoreThresholds: testSuite.mockBandScorer,
+			BandScoreThresholds: testSuite.bandScorer,
 			PeerScoring: pubsub.PeerScoreParams{
 				AppSpecificScore: func(p peer.ID) float64 {
 					if p == hosts[0].ID() {
@@ -121,9 +122,6 @@ func (testSuite *PeerScoresTestSuite) TestNegativeScores() {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	testSuite.mockBandScorer.On("Reset").Return(nil)
-	testSuite.mockBandScorer.On("Bucket", float64(0)).Return("nopx")
-	testSuite.mockBandScorer.On("Bucket", float64(-1000)).Return("graylist")
 	testSuite.mockMetricer.On("SetPeerScores", mock.Anything).Return(nil)
 
 	testSuite.mockGater.On("ListBlockedPeers").Return([]peer.ID{})