Improve vms/ tests with require (ava-labs#1505)

joshua-kim · Jun 15, 2023 · 94b9ce6 · 94b9ce6
1 parent f458045
commit 94b9ce6
Show file tree

Hide file tree

Showing 78 changed files with 1,954 additions and 3,394 deletions.
diff --git a/ids/aliases.go b/ids/aliases.go
@@ -10,7 +10,7 @@ import (
 )
 
 var (
-	errNoIDWithAlias      = errors.New("there is no ID with alias")
+	ErrNoIDWithAlias      = errors.New("there is no ID with alias")
 	errNoAliasForID       = errors.New("there is no alias for ID")
 	errAliasAlreadyMapped = errors.New("alias already mapped to an ID")
 )
@@ -68,7 +68,7 @@ func (a *aliaser) Lookup(alias string) (ID, error) {
 	if id, ok := a.dealias[alias]; ok {
 		return id, nil
 	}
-	return ID{}, fmt.Errorf("%w: %s", errNoIDWithAlias, alias)
+	return ID{}, fmt.Errorf("%w: %s", ErrNoIDWithAlias, alias)
 }
 
 func (a *aliaser) PrimaryAlias(id ID) (string, error) {

diff --git a/utils/formatting/address/address.go b/utils/formatting/address/address.go
@@ -14,7 +14,7 @@ import (
 const addressSep = "-"
 
 var (
-	errNoSeparator = errors.New("no separator found in address")
+	ErrNoSeparator = errors.New("no separator found in address")
 	errBits5To8    = errors.New("unable to convert address from 5-bit to 8-bit formatting")
 	errBits8To5    = errors.New("unable to convert address from 8-bit to 5-bit formatting")
 )
@@ -25,7 +25,7 @@ var (
 func Parse(addrStr string) (string, string, []byte, error) {
 	addressParts := strings.SplitN(addrStr, addressSep, 2)
 	if len(addressParts) < 2 {
-		return "", "", nil, errNoSeparator
+		return "", "", nil, ErrNoSeparator
 	}
 	chainID := addressParts[0]
 	rawAddr := addressParts[1]

diff --git a/vms/avm/blocks/builder/builder_test.go b/vms/avm/blocks/builder/builder_test.go
@@ -487,13 +487,12 @@ func TestBuilderBuildBlock(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			require := require.New(t)
 			ctrl := gomock.NewController(t)
 			defer ctrl.Finish()
 
 			builder := tt.builderFunc(ctrl)
 			_, err := builder.BuildBlock(context.Background())
-			require.ErrorIs(err, tt.expectedErr)
+			require.ErrorIs(t, err, tt.expectedErr)
 		})
 	}
 }
@@ -511,9 +510,7 @@ func TestBlockBuilderAddLocalTx(t *testing.T) {
 	tx := transactions[0]
 	txID := tx.ID()
 	require.NoError(mempool.Add(tx))
-
-	has := mempool.Has(txID)
-	require.True(has)
+	require.True(mempool.Has(txID))
 
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()

diff --git a/vms/avm/fx_test.go b/vms/avm/fx_test.go
@@ -6,6 +6,8 @@ package avm
 import (
 	"errors"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 var (
@@ -48,7 +50,7 @@ func (fx *FxTest) Initialize(vm interface{}) error {
 		return nil
 	}
 	if fx.T != nil {
-		fx.T.Fatal(errCalledInitialize)
+		require.FailNow(fx.T, errCalledInitialize.Error())
 	}
 	return errCalledInitialize
 }
@@ -61,7 +63,7 @@ func (fx *FxTest) Bootstrapping() error {
 		return nil
 	}
 	if fx.T != nil {
-		fx.T.Fatal(errCalledBootstrapping)
+		require.FailNow(fx.T, errCalledBootstrapping.Error())
 	}
 	return errCalledBootstrapping
 }
@@ -74,7 +76,7 @@ func (fx *FxTest) Bootstrapped() error {
 		return nil
 	}
 	if fx.T != nil {
-		fx.T.Fatal(errCalledBootstrapped)
+		require.FailNow(fx.T, errCalledBootstrapped.Error())
 	}
 	return errCalledBootstrapped
 }
@@ -87,7 +89,7 @@ func (fx *FxTest) VerifyTransfer(tx, in, cred, utxo interface{}) error {
 		return nil
 	}
 	if fx.T != nil {
-		fx.T.Fatal(errCalledVerifyTransfer)
+		require.FailNow(fx.T, errCalledVerifyTransfer.Error())
 	}
 	return errCalledVerifyTransfer
 }
@@ -100,7 +102,7 @@ func (fx *FxTest) VerifyOperation(tx, op, cred interface{}, utxos []interface{})
 		return nil
 	}
 	if fx.T != nil {
-		fx.T.Fatal(errCalledVerifyOperation)
+		require.FailNow(fx.T, errCalledVerifyOperation.Error())
 	}
 	return errCalledVerifyOperation
 }