sync: coreth PR #1271: style: enable depguard linter (#1886)

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/blockchain_ext_test.go

@@ -18,7 +18,6 @@ import (
 	"github.com/ava-labs/libevm/crypto"
 	"github.com/ava-labs/libevm/ethdb"
 	"github.com/holiman/uint256"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/ava-labs/subnet-evm/commontype"
@@ -1439,7 +1438,6 @@ func StatefulPrecompiles(t *testing.T, create createFunc) {
 		MaxBlockGasCost:  big.NewInt(4_000_000),
 		BlockGasCostStep: big.NewInt(500_000),
 	}
-	assert := assert.New(t)
 	tests := map[string]test{
 		"allow list": {
 			addTx: func(gen *BlockGen) {
@@ -1501,23 +1499,23 @@ func StatefulPrecompiles(t *testing.T, create createFunc) {
 			},
 			verifyState: func(sdb *state.StateDB) error {
 				res := feemanager.GetFeeManagerStatus(sdb, addr1)
-				assert.Equal(allowlist.AdminRole, res)
+				require.Equal(t, allowlist.AdminRole, res)
 
 				storedConfig := feemanager.GetStoredFeeConfig(sdb)
-				assert.Equal(testFeeConfig, storedConfig)
+				require.Equal(t, testFeeConfig, storedConfig)
 
 				feeConfig, _, err := blockchain.GetFeeConfigAt(blockchain.CurrentHeader())
 				require.NoError(t, err)
-				assert.Equal(testFeeConfig, feeConfig)
+				require.Equal(t, testFeeConfig, feeConfig)
 				return nil
 			},
 			verifyGenesis: func(sdb *state.StateDB) {
 				res := feemanager.GetFeeManagerStatus(sdb, addr1)
-				assert.Equal(allowlist.AdminRole, res)
+				require.Equal(t, allowlist.AdminRole, res)
 
 				feeConfig, _, err := blockchain.GetFeeConfigAt(blockchain.Genesis().Header())
 				require.NoError(t, err)
-				assert.Equal(params.GetExtra(&config).FeeConfig, feeConfig)
+				require.Equal(t, params.GetExtra(&config).FeeConfig, feeConfig)
 			},
 		},
 	}

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)
 	}

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, params.ToWithUpgradesJSON(wantConfig), gotConfig)
+	require.Equal(t, params.ToWithUpgradesJSON(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)
 			}
 		})
 	}