Merge pull request #6057 from ethereum-optimism/aj/remove-connect-disconnect

op-node: Remove unused OnConnect and OnDisconnect hooks

op-node/p2p/node.go

@@ -118,14 +118,6 @@ func (n *NodeP2P) init(resourcesCtx context.Context, rollupCfg *rollup.Config, l
 		}
 		n.store = eps
 		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())
-			},
-			DisconnectedF: func(_ network.Network, conn network.Conn) {
-				n.scorer.OnDisconnect(conn.RemotePeer())
-			},
-		})
 		// notify of any new connections/streams/etc.
 		n.host.Network().Notify(NewNetworkNotifier(log, metrics))
 		// note: the IDDelta functionality was removed from libP2P, and no longer needs to be explicitly disabled.

op-node/p2p/peer_scorer.go

@@ -35,8 +35,6 @@ type Peerstore interface {
 
 // Scorer is a peer scorer that scores peers based on application-specific metrics.
 type Scorer interface {
-	OnConnect(id peer.ID)
-	OnDisconnect(id peer.ID)
 	SnapshotHook() pubsub.ExtendedPeerScoreInspectFn
 }
 
@@ -86,13 +84,3 @@ func (s *scorer) SnapshotHook() pubsub.ExtendedPeerScoreInspectFn {
 		s.metricer.SetPeerScores(allScores)
 	}
 }
-
-// OnConnect is called when a peer connects.
-func (s *scorer) OnConnect(id peer.ID) {
-	// TODO(CLI-4003): apply decay to scores, based on last connection time
-}
-
-// OnDisconnect is called when a peer disconnects.
-func (s *scorer) OnDisconnect(id peer.ID) {
-	// TODO(CLI-4003): persist disconnect-time
-}

op-node/p2p/peer_scorer_test.go

@@ -38,28 +38,6 @@ func TestPeerScorer(t *testing.T) {
 	suite.Run(t, new(PeerScorerTestSuite))
 }
 
-// TestScorer_OnConnect ensures we can call the OnConnect method on the peer scorer.
-func (testSuite *PeerScorerTestSuite) TestScorer_OnConnect() {
-	scorer := p2p.NewScorer(
-		&rollup.Config{L2ChainID: big.NewInt(123)},
-		testSuite.mockStore,
-		testSuite.mockMetricer,
-		testSuite.logger,
-	)
-	scorer.OnConnect(peer.ID("alice"))
-}
-
-// TestScorer_OnDisconnect ensures we can call the OnDisconnect method on the peer scorer.
-func (testSuite *PeerScorerTestSuite) TestScorer_OnDisconnect() {
-	scorer := p2p.NewScorer(
-		&rollup.Config{L2ChainID: big.NewInt(123)},
-		testSuite.mockStore,
-		testSuite.mockMetricer,
-		testSuite.logger,
-	)
-	scorer.OnDisconnect(peer.ID("alice"))
-}
-
 // TestScorer_SnapshotHook tests running the snapshot hook on the peer scorer.
 func (testSuite *PeerScorerTestSuite) TestScorer_SnapshotHook() {
 	scorer := p2p.NewScorer(