Refactor p2p unit tests

go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/VictoriaMetrics/fastcache v1.10.0
-	github.com/ava-labs/avalanchego v1.10.18-0.20231212085650-4df2d3f2f052
+	github.com/ava-labs/avalanchego v1.10.18-rc.2
 	github.com/cespare/cp v0.1.0
 	github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811
 	github.com/davecgh/go-spew v1.1.1

go.sum

@@ -55,8 +55,8 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/ava-labs/avalanchego v1.10.18-0.20231212085650-4df2d3f2f052 h1:JQTyutUtLRairI/DI99LG9dJNcfM7v0nn2+qg9718gM=
-github.com/ava-labs/avalanchego v1.10.18-0.20231212085650-4df2d3f2f052/go.mod h1:npeYlspwYFUNHgCcm7vEjvsHQilLy3ymtSGJ4iZSRto=
+github.com/ava-labs/avalanchego v1.10.18-rc.2 h1:fjks/pUp7HmGzjupl+f3MfGo5cLkCrDnoCarL8NyqlA=
+github.com/ava-labs/avalanchego v1.10.18-rc.2/go.mod h1:D0tP5nGZtGb/vNOzvROUGUER+Gcar73l9qP97vbEarY=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=

peer/network_test.go

@@ -846,10 +846,17 @@ func TestNetworkCrossChainAppRequestAfterShutdown(t *testing.T) {
 
 func TestNetworkRouting(t *testing.T) {
 	require := require.New(t)
+	sender := &testAppSender{
+		sendAppRequestFn: func(_ context.Context, s set.Set[ids.NodeID], u uint32, bytes []byte) error {
+			return nil
+		},
+		sendAppResponseFn: func(id ids.NodeID, u uint32, bytes []byte) error {
+			return nil
+		},
+	}
 	protocol := 0
 	handler := &testSDKHandler{}
-	p2pNetwork := p2p.NewNetwork(logging.NoLog{}, &p2p.FakeSender{}, prometheus.NewRegistry(), "")
-	_, err := p2pNetwork.NewAppProtocol(uint64(protocol), handler)
+	p2pNetwork, err := p2p.NewNetwork(logging.NoLog{}, sender, prometheus.NewRegistry(), "")
 	require.NoError(err)
 	require.NoError(p2pNetwork.AddHandler(uint64(protocol), handler))
 

plugin/evm/tx_gossip_test.go

@@ -48,7 +48,7 @@ func TestEthTxGossip(t *testing.T) {
 	genesisBytes, err := genesis.MarshalJSON()
 	require.NoError(err)
 
-	responseSender := &p2p.FakeSender{
+	responseSender := &common.FakeSender{
 		SentAppResponse: make(chan []byte, 1),
 	}
 	vm := &VM{
@@ -75,12 +75,11 @@ func TestEthTxGossip(t *testing.T) {
 	}()
 
 	// sender for the peer requesting gossip from [vm]
-	peerSender := &p2p.FakeSender{
+	peerSender := &common.FakeSender{
 		SentAppRequest: make(chan []byte, 1),
 	}
-	network := p2p.NewNetwork(logging.NoLog{}, peerSender, prometheus.NewRegistry(), "")
 
-	client, err := network.NewAppProtocol(ethTxGossipProtocol, &p2p.NoOpHandler{})
+	network, err := p2p.NewNetwork(logging.NoLog{}, peerSender, prometheus.NewRegistry(), "")
 	require.NoError(err)
 	client := network.NewClient(ethTxGossipProtocol)
 
@@ -177,7 +176,7 @@ func TestAtomicTxGossip(t *testing.T) {
 	genesisBytes, err := genesis.MarshalJSON()
 	require.NoError(err)
 
-	responseSender := &p2p.FakeSender{
+	responseSender := &common.FakeSender{
 		SentAppResponse: make(chan []byte, 1),
 	}
 	vm := &VM{
@@ -204,12 +203,10 @@ func TestAtomicTxGossip(t *testing.T) {
 	}()
 
 	// sender for the peer requesting gossip from [vm]
-	peerSender := &p2p.FakeSender{
+	peerSender := &common.FakeSender{
 		SentAppRequest: make(chan []byte, 1),
 	}
-	network := p2p.NewNetwork(logging.NoLog{}, peerSender, prometheus.NewRegistry(), "")
-
-	client, err := network.NewAppProtocol(atomicTxGossipProtocol, &p2p.NoOpHandler{})
+	network, err := p2p.NewNetwork(logging.NoLog{}, peerSender, prometheus.NewRegistry(), "")
 	require.NoError(err)
 	client := network.NewClient(atomicTxGossipProtocol)
 

plugin/evm/vm.go

@@ -344,7 +344,8 @@ type VM struct {
 	// Used to serve BLS signatures of warp messages over RPC
 	warpBackend warp.Backend
 
-	p2pSender             p2p.AppSender
+	// Can be overridden in unit tests
+	p2pSender             commonEng.AppSender
 	ethTxGossipHandler    p2p.Handler
 	atomicTxGossipHandler p2p.Handler
 	ethTxGossiper         gossip.Gossiper
@@ -591,10 +592,13 @@ func (vm *VM) Initialize(
 
 	// initialize peer network
 	if vm.p2pSender == nil {
-		vm.p2pSender = p2p.NewSender(appSender)
+		vm.p2pSender = appSender
 	}
 
-	p2pNetwork := p2p.NewNetwork(vm.ctx.Log, vm.p2pSender, vm.sdkMetrics, "p2p")
+	p2pNetwork, err := p2p.NewNetwork(vm.ctx.Log, vm.p2pSender, vm.sdkMetrics, "p2p")
+	if err != nil {
+		return fmt.Errorf("failed to initialize p2p network: %w", err)
+	}
 	vm.validators = p2p.NewValidators(p2pNetwork.Peers, vm.ctx.Log, vm.ctx.SubnetID, vm.ctx.ValidatorState, maxValidatorSetStaleness)
 	vm.networkCodec = message.Codec
 	vm.Network = peer.NewNetwork(p2pNetwork, appSender, vm.networkCodec, message.CrossChainCodec, chainCtx.NodeID, vm.config.MaxOutboundActiveRequests, vm.config.MaxOutboundActiveCrossChainRequests)
@@ -1079,50 +1083,48 @@ func (vm *VM) initBlockBuilding() error {
 	}()
 
 	if vm.ethTxGossipHandler == nil {
-		vm.ethTxGossipHandler, err = gossip.NewHandler[*GossipEthTx](ethTxPool, ethTxGossipHandlerConfig, vm.sdkMetrics)
+		var ethTxGossipHandler p2p.Handler
+		ethTxGossipHandler, err = gossip.NewHandler[*GossipEthTx](ethTxPool, ethTxGossipHandlerConfig, vm.sdkMetrics)
 		if err != nil {
 			return err
 		}
 
-		vm.ethTxGossipHandler = &p2p.ValidatorHandler{
-			ValidatorSet: vm.validators,
-			Handler: &p2p.ThrottlerHandler{
-				Handler:   vm.ethTxGossipHandler,
-				Throttler: p2p.NewSlidingWindowThrottler(throttlingPeriod, throttlingLimit),
-				Log:       vm.ctx.Log,
-			},
-			Log: vm.ctx.Log,
-		}
+		ethTxGossipHandler = p2p.NewThrottlerHandler(
+			ethTxGossipHandler,
+			p2p.NewSlidingWindowThrottler(throttlingPeriod, throttlingLimit),
+			vm.ctx.Log,
+		)
+
+		vm.ethTxGossipHandler = p2p.NewValidatorHandler(ethTxGossipHandler, vm.validators, vm.ctx.Log)
 	}
-	ethTxGossipClient, err := vm.Network.NewAppProtocol(ethTxGossipProtocol, vm.ethTxGossipHandler, p2p.WithValidatorSampling(vm.validators))
-	if err != nil {
+
+	if err := vm.Network.AddHandler(ethTxGossipProtocol, vm.ethTxGossipHandler); err != nil {
 		return err
 	}
 
 	if vm.atomicTxGossipHandler == nil {
-		vm.atomicTxGossipHandler, err = gossip.NewHandler[*GossipAtomicTx](vm.mempool, atomicTxGossipHandlerConfig, vm.sdkMetrics)
+		var atomicTxGossipHandler p2p.Handler
+		atomicTxGossipHandler, err = gossip.NewHandler[*GossipAtomicTx](vm.mempool, atomicTxGossipHandlerConfig, vm.sdkMetrics)
 		if err != nil {
 			return err
 		}
 
-		vm.atomicTxGossipHandler = &p2p.ValidatorHandler{
-			ValidatorSet: vm.validators,
-			Handler: &p2p.ThrottlerHandler{
-				Throttler: p2p.NewSlidingWindowThrottler(throttlingPeriod, throttlingLimit),
-				Handler:   vm.atomicTxGossipHandler,
-				Log:       vm.ctx.Log,
-			},
-			Log: vm.ctx.Log,
-		}
+		atomicTxGossipHandler = p2p.NewThrottlerHandler(
+			atomicTxGossipHandler,
+			p2p.NewSlidingWindowThrottler(throttlingLimit, throttlingLimit),
+			vm.ctx.Log,
+		)
+
+		vm.atomicTxGossipHandler = p2p.NewValidatorHandler(atomicTxGossipHandler, vm.validators, vm.ctx.Log)
 	}
 
-	atomicTxGossipClient, err := vm.Network.NewAppProtocol(atomicTxGossipProtocol, vm.atomicTxGossipHandler, p2p.WithValidatorSampling(vm.validators))
-	if err != nil {
+	if err := vm.Network.AddHandler(atomicTxGossipProtocol, vm.atomicTxGossipHandler); err != nil {
 		return err
 	}
 
 	if vm.ethTxGossiper == nil {
-		vm.ethTxGossiper, err = gossip.NewPullGossiper[GossipEthTx, *GossipEthTx](
+		ethTxGossipClient := vm.Network.NewClient(ethTxGossipProtocol, p2p.WithValidatorSampling(vm.validators))
+		ethTxGossiper, err := gossip.NewPullGossiper[GossipEthTx, *GossipEthTx](
 			ethTxGossipConfig,
 			vm.ctx.Log,
 			ethTxPool,
@@ -1133,8 +1135,8 @@ func (vm *VM) initBlockBuilding() error {
 			return err
 		}
 
-		vm.ethTxGossiper = gossip.ValidatorGossiper{
-			Gossiper:   vm.ethTxGossiper,
+		vm.ethTxGossiper = &gossip.ValidatorGossiper{
+			Gossiper:   ethTxGossiper,
 			NodeID:     vm.ctx.NodeID,
 			Validators: vm.validators,
 		}
@@ -1147,7 +1149,8 @@ func (vm *VM) initBlockBuilding() error {
 	}()
 
 	if vm.atomicTxGossiper == nil {
-		vm.atomicTxGossiper, err = gossip.NewPullGossiper[GossipAtomicTx, *GossipAtomicTx](
+		atomicTxGossipClient := vm.Network.NewClient(atomicTxGossipProtocol, p2p.WithValidatorSampling(vm.validators))
+		atomicTxGossiper, err := gossip.NewPullGossiper[GossipAtomicTx, *GossipAtomicTx](
 			atomicTxGossipConfig,
 			vm.ctx.Log,
 			vm.mempool,
@@ -1157,8 +1160,9 @@ func (vm *VM) initBlockBuilding() error {
 		if err != nil {
 			return err
 		}
-		vm.atomicTxGossiper = gossip.ValidatorGossiper{
-			Gossiper:   vm.atomicTxGossiper,
+
+		vm.atomicTxGossiper = &gossip.ValidatorGossiper{
+			Gossiper:   atomicTxGossiper,
 			NodeID:     vm.ctx.NodeID,
 			Validators: vm.validators,
 		}

scripts/versions.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 # Don't export them as they're used in the context of other calls
-avalanche_version=${AVALANCHE_VERSION:-'sender-refactor'}
+avalanche_version=${AVALANCHE_VERSION:-'v1.10.18-rc.2'}