nit

Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>

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-0.20231212183827-1578bb29776c
 	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-0.20231212183827-1578bb29776c h1:ZD58N48KMzpPzhtVCp8h8kxS93XxlkDXmxIO4+I+mrc=
+github.com/ava-labs/avalanchego v1.10.18-0.20231212183827-1578bb29776c/go.mod h1:npeYlspwYFUNHgCcm7vEjvsHQilLy3ymtSGJ4iZSRto=
 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

@@ -816,7 +816,7 @@ func TestNetworkRouting(t *testing.T) {
 	require := require.New(t)
 	protocol := 0
 	handler := &testSDKHandler{}
-	p2pNetwork := p2p.NewNetwork(logging.NoLog{}, &p2p.FakeSender{}, prometheus.NewRegistry(), "")
+	p2pNetwork := p2p.NewNetwork(logging.NoLog{}, &common.FakeSender{}, prometheus.NewRegistry(), "")
 	_, err := p2pNetwork.NewAppProtocol(uint64(protocol), handler)
 	require.NoError(err)
 

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,7 +75,7 @@ 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(), "")
@@ -176,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{
@@ -203,7 +203,7 @@ 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(), "")

plugin/evm/vm.go

@@ -344,7 +344,7 @@ type VM struct {
 	// Used to serve BLS signatures of warp messages over RPC
 	warpBackend warp.Backend
 
-	p2pSender             p2p.AppSender
+	p2pSender             commonEng.AppSender
 	ethTxGossipHandler    p2p.Handler
 	atomicTxGossipHandler p2p.Handler
 	ethTxGossiper         gossip.Gossiper
@@ -591,7 +591,7 @@ 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")