sync: coreth PR #1198: style: enable testifylint linter (#1795)

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

Author: 4 people

.avalanche-golangci.yml

@@ -77,7 +77,7 @@ linters:
     - spancheck
     - staticcheck
     - tagalign
-    # - testifylint
+    - testifylint
     - unconvert
     - unparam
     - unused
@@ -208,16 +208,16 @@ linters:
         - serialize
       strict: true
     testifylint:
-    # Enable all checkers (https://github.com/Antonboom/testifylint#checkers).
-    # Default: false
-    enable-all: true
-    # Disable checkers by name
-    # (in addition to default
-    #   suite-thelper
-    # ).
-    disable:
-      - go-require
-      - float-compare
+      # Enable all checkers (https://github.com/Antonboom/testifylint#checkers).
+      # Default: false
+      enable-all: true
+      # Disable checkers by name
+      # (in addition to default
+      #   suite-thelper
+      # ).
+      disable:
+        - go-require
+        - float-compare
     unused:
       # Mark all struct fields that have been written to as used.
       # Default: true

accounts/abi/abi_extra_test.go

@@ -4,7 +4,6 @@
 package abi
 
 import (
-	"bytes"
 	"math/big"
 	"strings"
 	"testing"
@@ -82,14 +81,10 @@ func TestUnpackInputIntoInterface(t *testing.T) {
 				err = abi.UnpackInputIntoInterface(&v, "receive", data, test.strictMode) // skips 4 byte selector
 
 				if test.expectedErrorSubstring != "" {
-					require.Error(t, err)
 					require.ErrorContains(t, err, test.expectedErrorSubstring)
 				} else {
 					require.NoError(t, err)
-					// Verify unpacked values match input
-					require.Equal(t, v.Amount, input.Amount)
-					require.EqualValues(t, v.Amount, input.Amount)
-					require.True(t, bytes.Equal(v.Memo, input.Memo))
+					require.Equal(t, input, v)
 				}
 			})
 		}

accounts/abi/abi_test.go

@@ -1319,8 +1319,8 @@ func TestABI_PackEvent(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			assert.EqualValues(t, test.expectedTopics, topics)
-			assert.EqualValues(t, test.expectedData, data)
+			assert.Equal(t, test.expectedTopics, topics)
+			assert.Equal(t, test.expectedData, data)
 		})
 	}
 }

core/blockchain_ext_test.go

@@ -1705,20 +1705,20 @@ func StatefulPrecompiles(t *testing.T, create createFunc) {
 				assert.Equal(allowlist.AdminRole, res)
 
 				storedConfig := feemanager.GetStoredFeeConfig(sdb)
-				assert.EqualValues(testFeeConfig, storedConfig)
+				assert.Equal(testFeeConfig, storedConfig)
 
 				feeConfig, _, err := blockchain.GetFeeConfigAt(blockchain.CurrentHeader())
-				assert.NoError(err)
-				assert.EqualValues(testFeeConfig, feeConfig)
+				require.NoError(t, err)
+				assert.Equal(testFeeConfig, feeConfig)
 				return nil
 			},
 			verifyGenesis: func(sdb *state.StateDB) {
 				res := feemanager.GetFeeManagerStatus(sdb, addr1)
 				assert.Equal(allowlist.AdminRole, res)
 
 				feeConfig, _, err := blockchain.GetFeeConfigAt(blockchain.Genesis().Header())
-				assert.NoError(err)
-				assert.EqualValues(params.GetExtra(&config).FeeConfig, feeConfig)
+				require.NoError(t, err)
+				assert.Equal(params.GetExtra(&config).FeeConfig, feeConfig)
 			},
 		},
 	}

core/genesis_extra_test.go

@@ -102,7 +102,7 @@ func TestGenesisToBlockDecoding(t *testing.T) {
 			readHeader := rawdb.ReadHeader(db, block.Hash(), 0)
 			require.Equal(t, block.Hash(), readHeader.Hash())
 			require.Equal(t, previousHashes[fork], block.Hash())
-			require.EqualValues(t, block.Header(), readHeader)
+			require.Equal(t, block.Header(), readHeader)
 		})
 	}
 }

core/state_manager_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/types"
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 // Default state history size
@@ -42,7 +42,6 @@ func TestCappedMemoryTrieWriter(t *testing.T) {
 	m := &MockTrieDB{}
 	cacheConfig := &CacheConfig{Pruning: true, CommitInterval: 4096, StateHistory: uint64(tipBufferSize)}
 	w := NewTrieWriter(m, cacheConfig)
-	assert := assert.New(t)
 	for i := 0; i < int(cacheConfig.CommitInterval)+1; i++ {
 		bigI := big.NewInt(int64(i))
 		block := types.NewBlock(
@@ -53,35 +52,34 @@ func TestCappedMemoryTrieWriter(t *testing.T) {
 			nil, nil, nil, nil,
 		)
 
-		assert.NoError(w.InsertTrie(block))
-		assert.Equal(common.Hash{}, m.LastDereference, "should not have dereferenced block on insert")
-		assert.Equal(common.Hash{}, m.LastCommit, "should not have committed block on insert")
+		require.NoError(t, w.InsertTrie(block))
+		require.Zero(t, m.LastDereference, "should not have dereferenced block on insert")
+		require.Zero(t, m.LastCommit, "should not have committed block on insert")
 
 		w.AcceptTrie(block)
 		if i <= tipBufferSize {
-			assert.Equal(common.Hash{}, m.LastDereference, "should not have dereferenced block on accept")
+			require.Zero(t, m.LastDereference, "should not have dereferenced block on accept")
 		} else {
-			assert.Equal(common.BigToHash(big.NewInt(int64(i-tipBufferSize))), m.LastDereference, "should have dereferenced old block on last accept")
+			require.Equal(t, common.BigToHash(big.NewInt(int64(i-tipBufferSize))), m.LastDereference, "should have dereferenced old block on last accept")
 			m.LastDereference = common.Hash{}
 		}
 		if i < int(cacheConfig.CommitInterval) {
-			assert.Equal(common.Hash{}, m.LastCommit, "should not have committed block on accept")
+			require.Zero(t, m.LastCommit, "should not have committed block on accept")
 		} else {
-			assert.Equal(block.Root(), m.LastCommit, "should have committed block after CommitInterval")
+			require.Equal(t, block.Root(), m.LastCommit, "should have committed block after CommitInterval")
 			m.LastCommit = common.Hash{}
 		}
 
 		w.RejectTrie(block)
-		assert.Equal(block.Root(), m.LastDereference, "should have dereferenced block on reject")
-		assert.Equal(common.Hash{}, m.LastCommit, "should not have committed block on reject")
+		require.Equal(t, block.Root(), m.LastDereference, "should have dereferenced block on reject")
+		require.Zero(t, m.LastCommit, "should not have committed block on reject")
 		m.LastDereference = common.Hash{}
 	}
 }
 
 func TestNoPruningTrieWriter(t *testing.T) {
 	m := &MockTrieDB{}
 	w := NewTrieWriter(m, &CacheConfig{})
-	assert := assert.New(t)
 	for i := 0; i < tipBufferSize+1; i++ {
 		bigI := big.NewInt(int64(i))
 		block := types.NewBlock(
@@ -92,18 +90,18 @@ func TestNoPruningTrieWriter(t *testing.T) {
 			nil, nil, nil, nil,
 		)
 
-		assert.NoError(w.InsertTrie(block))
-		assert.Equal(common.Hash{}, m.LastDereference, "should not have dereferenced block on insert")
-		assert.Equal(common.Hash{}, m.LastCommit, "should not have committed block on insert")
+		require.NoError(t, w.InsertTrie(block))
+		require.Zero(t, m.LastDereference, "should not have dereferenced block on insert")
+		require.Zero(t, m.LastCommit, "should not have committed block on insert")
 
 		w.AcceptTrie(block)
-		assert.Equal(common.Hash{}, m.LastDereference, "should not have dereferenced block on accept")
-		assert.Equal(block.Root(), m.LastCommit, "should have committed block on accept")
+		require.Zero(t, m.LastDereference, "should not have dereferenced block on accept")
+		require.Equal(t, block.Root(), m.LastCommit, "should have committed block on accept")
 		m.LastCommit = common.Hash{}
 
 		w.RejectTrie(block)
-		assert.Equal(block.Root(), m.LastDereference, "should have dereferenced block on reject")
-		assert.Equal(common.Hash{}, m.LastCommit, "should not have committed block on reject")
+		require.Equal(t, block.Root(), m.LastDereference, "should have dereferenced block on reject")
+		require.Zero(t, m.LastCommit, "should not have committed block on reject")
 		m.LastDereference = common.Hash{}
 	}
 }

network/network.go

@@ -36,6 +36,7 @@ const (
 var (
 	errAcquiringSemaphore                      = errors.New("error acquiring semaphore")
 	errExpiredRequest                          = errors.New("expired request")
+	errNoPeersFound                            = errors.New("no peers found matching version")
 	_                     Network              = (*network)(nil)
 	_                     validators.Connector = (*network)(nil)
 	_                     common.AppHandler    = (*network)(nil)
@@ -180,7 +181,7 @@ func (n *network) SendAppRequestAny(ctx context.Context, minVersion *version.App
 	}
 
 	n.activeAppRequests.Release(1)
-	return ids.EmptyNodeID, fmt.Errorf("no peers found matching version %s out of %d peers", minVersion, n.peers.Size())
+	return ids.EmptyNodeID, fmt.Errorf("%w: version: %s, numPeers: %d", errNoPeersFound, minVersion, n.peers.Size())
 }
 
 // SendAppRequest sends request message bytes to specified nodeID, notifying the responseHandler on response or failure