style: enable depguard linter (#1271)

Signed-off-by: Jonathan Oppenheimer <[email protected]>
Signed-off-by: Jonathan Oppenheimer <[email protected]>
Co-authored-by: Austin Larson <[email protected]>
Co-authored-by: Austin Larson <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>

Author: 3 people

.avalanche-golangci.yml

@@ -54,7 +54,7 @@ linters:
     - asciicheck
     - bodyclose
     - copyloopvar
-    # - depguard
+    - depguard
     - errcheck
     - errorlint
     - forbidigo

core/coretest/test_indices.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/ava-labs/libevm/core/rawdb"
 	"github.com/ava-labs/libevm/ethdb"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -25,10 +24,10 @@ func CheckTxIndices(t *testing.T, expectedTail *uint64, indexedFrom uint64, inde
 		var stored uint64
 		tailValue := *expectedTail
 
-		require.EventuallyWithTf(t,
-			func(c *assert.CollectT) {
+		require.Eventually(t,
+			func() bool {
 				stored = *rawdb.ReadTxIndexTail(db)
-				assert.Equalf(c, tailValue, stored, "expected tail to be %d, found %d", tailValue, stored)
+				return tailValue == stored
 			},
 			30*time.Second, 500*time.Millisecond, "expected tail to be %d eventually", tailValue)
 	}

core/extstate/state_object_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/ava-labs/libevm/common"
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestStateKeyPartition(t *testing.T) {
@@ -61,11 +61,11 @@ func TestStateKeyPartition(t *testing.T) {
 		t.Run(test.key.Hex(), func(t *testing.T) {
 			coin := test.key
 			normalizeCoinID(&coin)
-			assert.Equal(t, test.wantCoinID, coin)
+			require.Equal(t, test.wantCoinID, coin)
 
 			state := test.key
 			normalizeStateKey(&state)
-			assert.Equal(t, test.wantStateKey, state)
+			require.Equal(t, test.wantStateKey, state)
 		})
 	}
 }
@@ -81,6 +81,6 @@ func FuzzStateKeyPartition(f *testing.F) {
 		)
 		normalizeCoinID(&coin)
 		normalizeStateKey(&state)
-		assert.NotEqual(t, coin, state)
+		require.NotEqual(t, coin, state)
 	})
 }

internal/ethapi/api_extra_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/common/hexutil"
 	"github.com/ava-labs/libevm/core/types"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 
@@ -47,7 +46,7 @@ func TestBlockchainAPI_GetChainConfig(t *testing.T) {
 	api := NewBlockChainAPI(backend)
 
 	gotConfig := api.GetChainConfig(t.Context())
-	assert.Equal(t, wantConfig, gotConfig)
+	require.Equal(t, wantConfig, gotConfig)
 }
 
 // Copy one test case from TestCall
@@ -204,9 +203,9 @@ func TestBlockChainAPI_stateQueryBlockNumberAllowed(t *testing.T) {
 
 			err := api.stateQueryBlockNumberAllowed(testCase.blockNumOrHash)
 			if testCase.wantErrMessage == "" {
-				assert.NoError(t, err)
+				require.NoError(t, err)
 			} else {
-				assert.EqualError(t, err, testCase.wantErrMessage)
+				require.EqualError(t, err, testCase.wantErrMessage)
 			}
 		})
 	}

nativeasset/contract_test.go

@@ -13,7 +13,6 @@ import (
 	"github.com/ava-labs/libevm/core/state"
 	"github.com/ava-labs/libevm/core/vm"
 	"github.com/holiman/uint256"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/ava-labs/coreth/core"
@@ -91,7 +90,6 @@ func TestStatefulPrecompile(t *testing.T) {
 	userAddr2 := common.BytesToAddress([]byte("user2"))
 	assetID := common.BytesToHash([]byte("ScoobyCoin"))
 	zeroBytes := make([]byte, 32)
-	big0 := uint256.NewInt(0)
 	bigHundred := big.NewInt(100)
 	u256Hundred := uint256.NewInt(100)
 	oneHundredBytes := make([]byte, 32)
@@ -116,7 +114,7 @@ func TestStatefulPrecompile(t *testing.T) {
 			from:                 userAddr1,
 			precompileAddr:       NativeAssetBalanceAddr,
 			input:                PackNativeAssetBalanceInput(userAddr1, assetID),
-			value:                big0,
+			value:                common.U2560,
 			gasInput:             params.AssetBalanceApricot,
 			expectedGasRemaining: 0,
 			expectedErr:          nil,
@@ -141,7 +139,7 @@ func TestStatefulPrecompile(t *testing.T) {
 			from:                 userAddr1,
 			precompileAddr:       NativeAssetBalanceAddr,
 			input:                PackNativeAssetBalanceInput(userAddr1, assetID),
-			value:                big0,
+			value:                common.U2560,
 			gasInput:             params.AssetBalanceApricot,
 			expectedGasRemaining: 0,
 			expectedErr:          nil,
@@ -165,7 +163,7 @@ func TestStatefulPrecompile(t *testing.T) {
 			from:                 userAddr1,
 			precompileAddr:       NativeAssetBalanceAddr,
 			input:                PackNativeAssetBalanceInput(userAddr1, assetID),
-			value:                big0,
+			value:                common.U2560,
 			gasInput:             params.AssetBalanceApricot,
 			expectedGasRemaining: 0,
 			expectedErr:          nil,
@@ -181,7 +179,7 @@ func TestStatefulPrecompile(t *testing.T) {
 			from:                 userAddr1,
 			precompileAddr:       NativeAssetBalanceAddr,
 			input:                nil,
-			value:                big0,
+			value:                common.U2560,
 			gasInput:             params.AssetBalanceApricot,
 			expectedGasRemaining: 0,
 			expectedErr:          vm.ErrExecutionReverted,
@@ -197,7 +195,7 @@ func TestStatefulPrecompile(t *testing.T) {
 			from:                 userAddr1,
 			precompileAddr:       NativeAssetBalanceAddr,
 			input:                PackNativeAssetBalanceInput(userAddr1, assetID),
-			value:                big0,
+			value:                common.U2560,
 			gasInput:             params.AssetBalanceApricot - 1,
 			expectedGasRemaining: 0,
 			expectedErr:          vm.ErrOutOfGas,
@@ -233,7 +231,7 @@ func TestStatefulPrecompile(t *testing.T) {
 			from:                 userAddr1,
 			precompileAddr:       NativeAssetCallAddr,
 			input:                PackNativeAssetCallInput(userAddr2, assetID, big.NewInt(50), nil),
-			value:                big0,
+			value:                common.U2560,
 			gasInput:             params.AssetCallApricot + ethparams.CallNewAccountGas + 123,
 			expectedGasRemaining: 123,
 			expectedErr:          nil,
@@ -248,7 +246,7 @@ func TestStatefulPrecompile(t *testing.T) {
 
 				expectedBalance := big.NewInt(50)
 				require.Equal(t, u256Hundred, user1Balance, "user 1 balance")
-				require.Equal(t, big0, user2Balance, "user 2 balance")
+				require.True(t, user2Balance.IsZero(), "user 2 balance should be zero")
 				require.Equal(t, expectedBalance, user1AssetBalance, "user 1 asset balance")
 				require.Equal(t, expectedBalance, user2AssetBalance, "user 2 asset balance")
 			},
@@ -282,7 +280,7 @@ func TestStatefulPrecompile(t *testing.T) {
 				expectedBalance := big.NewInt(50)
 
 				require.Equal(t, uint256.NewInt(51), user1Balance, "user 1 balance")
-				require.Equal(t, big0, user2Balance, "user 2 balance")
+				require.True(t, user2Balance.IsZero(), "user 2 balance should be zero")
 				require.Equal(t, uint256.NewInt(49), nativeAssetCallAddrBalance, "native asset call addr balance")
 				require.Equal(t, expectedBalance, user1AssetBalance, "user 1 asset balance")
 				require.Equal(t, expectedBalance, user2AssetBalance, "user 2 asset balance")
@@ -314,10 +312,10 @@ func TestStatefulPrecompile(t *testing.T) {
 				user1AssetBalance := wrappedStateDB.GetBalanceMultiCoin(userAddr1, assetID)
 				user2AssetBalance := wrappedStateDB.GetBalanceMultiCoin(userAddr2, assetID)
 
-				require.Equal(t, bigHundred, user1Balance, "user 1 balance")
-				require.Equal(t, big0, user2Balance, "user 2 balance")
-				require.Equal(t, big.NewInt(51), user1AssetBalance, "user 1 asset balance")
-				require.Equal(t, big0, user2AssetBalance, "user 2 asset balance")
+				require.Equal(t, u256Hundred, user1Balance, "user 1 balance")
+				require.True(t, user2Balance.IsZero(), "user 2 balance should be zero")
+				require.Equal(t, big.NewInt(50), user1AssetBalance, "user 1 asset balance")
+				require.Zero(t, user2AssetBalance.Cmp(common.Big0), "user 2 asset balance should be zero")
 			},
 		},
 		{
@@ -346,10 +344,10 @@ func TestStatefulPrecompile(t *testing.T) {
 				user1AssetBalance := wrappedStateDB.GetBalanceMultiCoin(userAddr1, assetID)
 				user2AssetBalance := wrappedStateDB.GetBalanceMultiCoin(userAddr2, assetID)
 
-				require.Equal(t, big.NewInt(50), user1Balance, "user 1 balance")
-				require.Equal(t, big0, user2Balance, "user 2 balance")
+				require.Equal(t, uint256.NewInt(50), user1Balance, "user 1 balance")
+				require.True(t, user2Balance.IsZero(), "user 2 balance should be zero")
 				require.Equal(t, big.NewInt(50), user1AssetBalance, "user 1 asset balance")
-				require.Equal(t, big0, user2AssetBalance, "user 2 asset balance")
+				require.Zero(t, user2AssetBalance.Cmp(common.Big0), "user 2 asset balance should be zero")
 			},
 		},
 		{
@@ -398,10 +396,10 @@ func TestStatefulPrecompile(t *testing.T) {
 				user1AssetBalance := wrappedStateDB.GetBalanceMultiCoin(userAddr1, assetID)
 				user2AssetBalance := wrappedStateDB.GetBalanceMultiCoin(userAddr2, assetID)
 
-				require.Equal(t, bigHundred, user1Balance, "user 1 balance")
-				require.Equal(t, big0, user2Balance, "user 2 balance")
+				require.Equal(t, u256Hundred, user1Balance, "user 1 balance")
+				require.True(t, user2Balance.IsZero(), "user 2 balance should be zero")
 				require.Equal(t, bigHundred, user1AssetBalance, "user 1 asset balance")
-				require.Equal(t, big0, user2AssetBalance, "user 2 asset balance")
+				require.Zero(t, user2AssetBalance.Cmp(common.Big0), "user 2 asset balance should be zero")
 			},
 		},
 		{
@@ -437,7 +435,7 @@ func TestStatefulPrecompile(t *testing.T) {
 			from:                 userAddr1,
 			precompileAddr:       GenesisContractAddr,
 			input:                PackNativeAssetCallInput(userAddr2, assetID, big.NewInt(50), nil),
-			value:                big0,
+			value:                common.U2560,
 			gasInput:             params.AssetCallApricot + ethparams.CallNewAccountGas,
 			expectedGasRemaining: params.AssetCallApricot + ethparams.CallNewAccountGas,
 			expectedErr:          vm.ErrExecutionReverted,
@@ -451,18 +449,11 @@ func TestStatefulPrecompile(t *testing.T) {
 			// Create EVM with BlockNumber and Time initialized to 0 to enable Apricot Rules.
 			evm := vm.NewEVM(vmCtx, vm.TxContext{}, stateDB, params.TestApricotPhase5Config, vm.Config{}) // Use ApricotPhase5Config because these precompiles are deprecated in ApricotPhase6.
 			ret, gasRemaining, err := evm.Call(vm.AccountRef(test.from), test.precompileAddr, test.input, test.gasInput, test.value)
-			// Place gas remaining check before error check, so that it is not skipped when there is an error
-			assert.Equalf(t, test.expectedGasRemaining, gasRemaining, "unexpected gas remaining (%d of %d)", gasRemaining, test.gasInput)
-
-			if test.expectedErr != nil {
-				assert.Equal(t, test.expectedErr, err, "expected error to match")
-				return
-			}
-			if assert.NoError(t, err, "EVM Call produced unexpected error") {
-				assert.Equal(t, test.expectedResult, ret, "unexpected return value")
-				if test.stateDBCheck != nil {
-					test.stateDBCheck(t, stateDB)
-				}
+			require.ErrorIs(t, err, test.expectedErr)
+			require.Equalf(t, test.expectedGasRemaining, gasRemaining, "unexpected gas remaining (%d of %d)", gasRemaining, test.gasInput)
+			require.Equal(t, test.expectedResult, ret, "unexpected return value")
+			if test.stateDBCheck != nil {
+				test.stateDBCheck(t, stateDB)
 			}
 		})
 	}