Move network implementation to separate package

vms/platformvm/block/builder/builder.go

@@ -41,10 +41,6 @@ var (
 type Builder interface {
 	mempool.Mempool
 	mempool.BlockTimer
-	Network
-
-	// AddUnverifiedTx verifier the tx before adding it to mempool
-	AddUnverifiedTx(tx *txs.Tx) error
 
 	// BuildBlock is called on timer clock to attempt to create
 	// next block
@@ -57,7 +53,6 @@ type Builder interface {
 // builder implements a simple builder to convert txs into valid blocks
 type builder struct {
 	mempool.Mempool
-	Network
 
 	txBuilder         txbuilder.Builder
 	txExecutorBackend *txexecutor.Backend
@@ -78,7 +73,6 @@ func New(
 	txExecutorBackend *txexecutor.Backend,
 	blkManager blockexecutor.Manager,
 	toEngine chan<- common.Message,
-	appSender common.AppSender,
 ) Builder {
 	builder := &builder{
 		Mempool:           mempool,
@@ -90,40 +84,10 @@ func New(
 
 	builder.timer = timer.NewTimer(builder.setNextBuildBlockTime)
 
-	builder.Network = NewNetwork(
-		txExecutorBackend.Ctx,
-		builder,
-		appSender,
-	)
-
 	go txExecutorBackend.Ctx.Log.RecoverAndPanic(builder.timer.Dispatch)
 	return builder
 }
 
-// AddUnverifiedTx verifies a transaction and attempts to add it to the mempool
-func (b *builder) AddUnverifiedTx(tx *txs.Tx) error {
-	txID := tx.ID()
-	if b.Mempool.Has(txID) {
-		// If the transaction is already in the mempool - then it looks the same
-		// as if it was successfully added
-		return nil
-	}
-
-	if err := b.blkManager.VerifyTx(tx); err != nil {
-		b.MarkDropped(txID, err)
-		return err
-	}
-
-	// If we are partially syncing the Primary Network, we should not be
-	// maintaining the transaction mempool locally.
-	if !b.txExecutorBackend.Config.PartialSyncPrimaryNetwork {
-		if err := b.Mempool.Add(tx); err != nil {
-			return err
-		}
-	}
-	return b.GossipTx(context.TODO(), tx)
-}
-
 // BuildBlock builds a block to be added to consensus.
 // This method removes the transactions from the returned
 // blocks from the mempool.

vms/platformvm/block/builder/builder_test.go

@@ -51,7 +51,7 @@ func TestBlockBuilderAddLocalTx(t *testing.T) {
 	env.sender.SendAppGossipF = func(context.Context, []byte) error {
 		return nil
 	}
-	require.NoError(env.Builder.AddUnverifiedTx(tx))
+	require.NoError(env.network.IssueTx(context.Background(), tx))
 	require.True(env.mempool.Has(txID))
 
 	// show that build block include that tx and removes it from mempool

vms/platformvm/block/builder/helpers_test.go

@@ -40,6 +40,7 @@ import (
 	"github.com/ava-labs/avalanchego/vms/platformvm/config"
 	"github.com/ava-labs/avalanchego/vms/platformvm/fx"
 	"github.com/ava-labs/avalanchego/vms/platformvm/metrics"
+	"github.com/ava-labs/avalanchego/vms/platformvm/network"
 	"github.com/ava-labs/avalanchego/vms/platformvm/reward"
 	"github.com/ava-labs/avalanchego/vms/platformvm/state"
 	"github.com/ava-labs/avalanchego/vms/platformvm/status"
@@ -87,6 +88,7 @@ type environment struct {
 	Builder
 	blkManager blockexecutor.Manager
 	mempool    mempool.Mempool
+	network    network.Network
 	sender     *common.SenderTest
 
 	isBootstrapped *utils.Atomic[bool]
@@ -168,13 +170,20 @@ func newEnvironment(t *testing.T) *environment {
 		pvalidators.TestManager,
 	)
 
+	res.network = network.New(
+		res.backend.Ctx,
+		res.blkManager,
+		res.mempool,
+		res.backend.Config.PartialSyncPrimaryNetwork,
+		res.sender,
+	)
+
 	res.Builder = New(
 		res.mempool,
 		res.txBuilder,
 		&res.backend,
 		res.blkManager,
 		nil, // toEngine,
-		res.sender,
 	)
 
 	res.blkManager.SetPreference(genesisID)
@@ -420,3 +429,17 @@ func shutdownEnvironment(env *environment) error {
 		env.baseDB.Close(),
 	)
 }
+
+func getValidTx(txBuilder txbuilder.Builder, t *testing.T) *txs.Tx {
+	tx, err := txBuilder.NewCreateChainTx(
+		testSubnet1.ID(),
+		nil,
+		constants.AVMID,
+		nil,
+		"chain name",
+		[]*secp256k1.PrivateKey{testSubnet1ControlKeys[0], testSubnet1ControlKeys[1]},
+		ids.ShortEmpty,
+	)
+	require.NoError(t, err)
+	return tx
+}

vms/platformvm/network/main_test.go

@@ -0,0 +1,14 @@
+// Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package network
+
+import (
+	"testing"
+
+	"go.uber.org/goleak"
+)
+
+func TestMain(m *testing.M) {
+	goleak.VerifyTestMain(m)
+}