Remove AddUnverifiedTx from Builder (#2311)

vms/platformvm/block/builder/builder.go

@@ -43,9 +43,6 @@ type Builder interface {
 	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
 	BuildBlock(context.Context) (snowman.Block, error)
@@ -100,11 +97,6 @@ func New(
 	return builder
 }
 
-// AddUnverifiedTx verifies a transaction and attempts to add it to the mempool
-func (b *builder) AddUnverifiedTx(tx *txs.Tx) error {
-	return b.Network.IssueTx(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.Builder.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/network.go

@@ -63,7 +63,7 @@ func NewNetwork(
 	}
 }
 
-func (n *network) AppGossip(_ context.Context, nodeID ids.NodeID, msgBytes []byte) error {
+func (n *network) AppGossip(ctx context.Context, nodeID ids.NodeID, msgBytes []byte) error {
 	n.ctx.Log.Debug("called AppGossip message handler",
 		zap.Stringer("nodeID", nodeID),
 		zap.Int("messageLen", len(msgBytes)),
@@ -115,7 +115,7 @@ func (n *network) AppGossip(_ context.Context, nodeID ids.NodeID, msgBytes []byt
 	}
 
 	// add to mempool
-	if err := n.blkBuilder.AddUnverifiedTx(tx); err != nil {
+	if err := n.IssueTx(ctx, tx); err != nil {
 		n.ctx.Log.Debug("tx failed verification",
 			zap.Stringer("nodeID", nodeID),
 			zap.Error(err),

vms/platformvm/block/builder/network_test.go

@@ -125,7 +125,7 @@ func TestMempoolNewLocaTxIsGossiped(t *testing.T) {
 	tx := getValidTx(env.txBuilder, t)
 	txID := tx.ID()
 
-	require.NoError(env.Builder.AddUnverifiedTx(tx))
+	require.NoError(env.Builder.IssueTx(context.Background(), tx))
 	require.NotNil(gossipedBytes)
 
 	// show gossiped bytes can be decoded to the original tx

vms/platformvm/service.go

@@ -1185,7 +1185,7 @@ type AddValidatorArgs struct {
 
 // AddValidator creates and signs and issues a transaction to add a validator to
 // the primary network
-func (s *Service) AddValidator(_ *http.Request, args *AddValidatorArgs, reply *api.JSONTxIDChangeAddr) error {
+func (s *Service) AddValidator(req *http.Request, args *AddValidatorArgs, reply *api.JSONTxIDChangeAddr) error {
 	s.vm.ctx.Log.Warn("deprecated API called",
 		zap.String("service", "platform"),
 		zap.String("method", "addValidator"),
@@ -1284,7 +1284,7 @@ func (s *Service) AddValidator(_ *http.Request, args *AddValidatorArgs, reply *a
 
 	return utils.Err(
 		err,
-		s.vm.Builder.AddUnverifiedTx(tx),
+		s.vm.Builder.IssueTx(req.Context(), tx),
 		user.Close(),
 	)
 }
@@ -1299,7 +1299,7 @@ type AddDelegatorArgs struct {
 
 // AddDelegator creates and signs and issues a transaction to add a delegator to
 // the primary network
-func (s *Service) AddDelegator(_ *http.Request, args *AddDelegatorArgs, reply *api.JSONTxIDChangeAddr) error {
+func (s *Service) AddDelegator(req *http.Request, args *AddDelegatorArgs, reply *api.JSONTxIDChangeAddr) error {
 	s.vm.ctx.Log.Warn("deprecated API called",
 		zap.String("service", "platform"),
 		zap.String("method", "addDelegator"),
@@ -1394,7 +1394,7 @@ func (s *Service) AddDelegator(_ *http.Request, args *AddDelegatorArgs, reply *a
 
 	return utils.Err(
 		err,
-		s.vm.Builder.AddUnverifiedTx(tx),
+		s.vm.Builder.IssueTx(req.Context(), tx),
 		user.Close(),
 	)
 }
@@ -1410,7 +1410,7 @@ type AddSubnetValidatorArgs struct {
 
 // AddSubnetValidator creates and signs and issues a transaction to add a
 // validator to a subnet other than the primary network
-func (s *Service) AddSubnetValidator(_ *http.Request, args *AddSubnetValidatorArgs, response *api.JSONTxIDChangeAddr) error {
+func (s *Service) AddSubnetValidator(req *http.Request, args *AddSubnetValidatorArgs, response *api.JSONTxIDChangeAddr) error {
 	s.vm.ctx.Log.Warn("deprecated API called",
 		zap.String("service", "platform"),
 		zap.String("method", "addSubnetValidator"),
@@ -1500,7 +1500,7 @@ func (s *Service) AddSubnetValidator(_ *http.Request, args *AddSubnetValidatorAr
 
 	return utils.Err(
 		err,
-		s.vm.Builder.AddUnverifiedTx(tx),
+		s.vm.Builder.IssueTx(req.Context(), tx),
 		user.Close(),
 	)
 }
@@ -1515,7 +1515,7 @@ type CreateSubnetArgs struct {
 
 // CreateSubnet creates and signs and issues a transaction to create a new
 // subnet
-func (s *Service) CreateSubnet(_ *http.Request, args *CreateSubnetArgs, response *api.JSONTxIDChangeAddr) error {
+func (s *Service) CreateSubnet(req *http.Request, args *CreateSubnetArgs, response *api.JSONTxIDChangeAddr) error {
 	s.vm.ctx.Log.Warn("deprecated API called",
 		zap.String("service", "platform"),
 		zap.String("method", "createSubnet"),
@@ -1576,7 +1576,7 @@ func (s *Service) CreateSubnet(_ *http.Request, args *CreateSubnetArgs, response
 
 	return utils.Err(
 		err,
-		s.vm.Builder.AddUnverifiedTx(tx),
+		s.vm.Builder.IssueTx(req.Context(), tx),
 		user.Close(),
 	)
 }
@@ -1599,7 +1599,7 @@ type ExportAVAXArgs struct {
 
 // ExportAVAX exports AVAX from the P-Chain to the X-Chain
 // It must be imported on the X-Chain to complete the transfer
-func (s *Service) ExportAVAX(_ *http.Request, args *ExportAVAXArgs, response *api.JSONTxIDChangeAddr) error {
+func (s *Service) ExportAVAX(req *http.Request, args *ExportAVAXArgs, response *api.JSONTxIDChangeAddr) error {
 	s.vm.ctx.Log.Warn("deprecated API called",
 		zap.String("service", "platform"),
 		zap.String("method", "exportAVAX"),
@@ -1672,7 +1672,7 @@ func (s *Service) ExportAVAX(_ *http.Request, args *ExportAVAXArgs, response *ap
 
 	return utils.Err(
 		err,
-		s.vm.Builder.AddUnverifiedTx(tx),
+		s.vm.Builder.IssueTx(req.Context(), tx),
 		user.Close(),
 	)
 }
@@ -1691,7 +1691,7 @@ type ImportAVAXArgs struct {
 
 // ImportAVAX issues a transaction to import AVAX from the X-chain. The AVAX
 // must have already been exported from the X-Chain.
-func (s *Service) ImportAVAX(_ *http.Request, args *ImportAVAXArgs, response *api.JSONTxIDChangeAddr) error {
+func (s *Service) ImportAVAX(req *http.Request, args *ImportAVAXArgs, response *api.JSONTxIDChangeAddr) error {
 	s.vm.ctx.Log.Warn("deprecated API called",
 		zap.String("service", "platform"),
 		zap.String("method", "importAVAX"),
@@ -1757,7 +1757,7 @@ func (s *Service) ImportAVAX(_ *http.Request, args *ImportAVAXArgs, response *ap
 
 	return utils.Err(
 		err,
-		s.vm.Builder.AddUnverifiedTx(tx),
+		s.vm.Builder.IssueTx(req.Context(), tx),
 		user.Close(),
 	)
 }
@@ -1787,7 +1787,7 @@ type CreateBlockchainArgs struct {
 }
 
 // CreateBlockchain issues a transaction to create a new blockchain
-func (s *Service) CreateBlockchain(_ *http.Request, args *CreateBlockchainArgs, response *api.JSONTxIDChangeAddr) error {
+func (s *Service) CreateBlockchain(req *http.Request, args *CreateBlockchainArgs, response *api.JSONTxIDChangeAddr) error {
 	s.vm.ctx.Log.Warn("deprecated API called",
 		zap.String("service", "platform"),
 		zap.String("method", "createBlockchain"),
@@ -1881,7 +1881,7 @@ func (s *Service) CreateBlockchain(_ *http.Request, args *CreateBlockchainArgs,
 
 	return utils.Err(
 		err,
-		s.vm.Builder.AddUnverifiedTx(tx),
+		s.vm.Builder.IssueTx(req.Context(), tx),
 		user.Close(),
 	)
 }
@@ -2155,7 +2155,7 @@ func (s *Service) GetBlockchains(_ *http.Request, _ *struct{}, response *GetBloc
 	return nil
 }
 
-func (s *Service) IssueTx(_ *http.Request, args *api.FormattedTx, response *api.JSONTxID) error {
+func (s *Service) IssueTx(req *http.Request, args *api.FormattedTx, response *api.JSONTxID) error {
 	s.vm.ctx.Log.Debug("API called",
 		zap.String("service", "platform"),
 		zap.String("method", "issueTx"),
@@ -2173,7 +2173,7 @@ func (s *Service) IssueTx(_ *http.Request, args *api.FormattedTx, response *api.
 	s.vm.ctx.Lock.Lock()
 	defer s.vm.ctx.Lock.Unlock()
 
-	if err := s.vm.Builder.AddUnverifiedTx(tx); err != nil {
+	if err := s.vm.Builder.IssueTx(req.Context(), tx); err != nil {
 		return fmt.Errorf("couldn't issue tx: %w", err)
 	}
 

vms/platformvm/service_test.go

@@ -238,12 +238,12 @@ func TestGetTxStatus(t *testing.T) {
 	service.vm.ctx.Lock.Lock()
 
 	// put the chain in existing chain list
-	err = service.vm.Builder.AddUnverifiedTx(tx)
+	err = service.vm.Builder.IssueTx(context.Background(), tx)
 	require.ErrorIs(err, database.ErrNotFound) // Missing shared memory UTXO
 
 	mutableSharedMemory.SharedMemory = sm
 
-	require.NoError(service.vm.Builder.AddUnverifiedTx(tx))
+	require.NoError(service.vm.Builder.IssueTx(context.Background(), tx))
 
 	block, err := service.vm.BuildBlock(context.Background())
 	require.NoError(err)
@@ -339,7 +339,7 @@ func TestGetTx(t *testing.T) {
 
 				service.vm.ctx.Lock.Lock()
 
-				require.NoError(service.vm.Builder.AddUnverifiedTx(tx))
+				require.NoError(service.vm.Builder.IssueTx(context.Background(), tx))
 
 				blk, err := service.vm.BuildBlock(context.Background())
 				require.NoError(err)

vms/platformvm/validator_set_property_test.go

@@ -374,7 +374,7 @@ func addPrimaryValidatorWithoutBLSKey(vm *VM, data *validatorInputData) (*state.
 
 func internalAddValidator(vm *VM, signedTx *txs.Tx) (*state.Staker, error) {
 	stakerTx := signedTx.Unsigned.(txs.StakerTx)
-	if err := vm.Builder.AddUnverifiedTx(signedTx); err != nil {
+	if err := vm.Builder.IssueTx(context.Background(), signedTx); err != nil {
 		return nil, fmt.Errorf("could not add tx to mempool: %w", err)
 	}
 
@@ -802,7 +802,7 @@ func buildVM(t *testing.T) (*VM, ids.ID, error) {
 	if err != nil {
 		return nil, ids.Empty, err
 	}
-	if err := vm.Builder.AddUnverifiedTx(testSubnet1); err != nil {
+	if err := vm.Builder.IssueTx(context.Background(), testSubnet1); err != nil {
 		return nil, ids.Empty, err
 	}