Add errorlint linter with errorf setting disabled

Author: qdm12

.golangci.yml

@@ -26,6 +26,11 @@ linters:
     - mirror
     - tenv
     - errcheck
+    - errorlint
+
+linters-settings:
+  errorlint:
+    errorf: false
 
 issues:
   exclude-rules:
@@ -37,6 +42,7 @@ issues:
     - path-except: "(plugin\\/.+\\.go|.+_ext\\.go)"
       linters:
         - errcheck
+        - errorlint
         - gosimple
         - govet
         - staticcheck

plugin/evm/atomic_backend.go

@@ -5,6 +5,7 @@ package evm
 
 import (
 	"encoding/binary"
+	"errors"
 	"fmt"
 	"time"
 
@@ -226,7 +227,7 @@ func (a *atomicBackend) initialize(lastAcceptedHeight uint64) error {
 // the range of operations that were added to the trie without being executed on shared memory.
 func (a *atomicBackend) ApplyToSharedMemory(lastAcceptedBlock uint64) error {
 	sharedMemoryCursor, err := a.metadataDB.Get(appliedSharedMemoryCursorKey)
-	if err == database.ErrNotFound {
+	if errors.Is(err, database.ErrNotFound) {
 		return nil
 	} else if err != nil {
 		return err

plugin/evm/atomic_trie.go

@@ -4,6 +4,7 @@
 package evm
 
 import (
+	"errors"
 	"fmt"
 	"time"
 
@@ -183,7 +184,7 @@ func lastCommittedRootIfExists(db avalanchedatabase.Database) (common.Hash, uint
 	// read the last committed entry if it exists and set the root hash
 	lastCommittedHeightBytes, err := db.Get(lastCommittedKey)
 	switch {
-	case err == avalanchedatabase.ErrNotFound:
+	case errors.Is(err, avalanchedatabase.ErrNotFound):
 		return common.Hash{}, 0, nil
 	case err != nil:
 		return common.Hash{}, 0, err
@@ -305,7 +306,7 @@ func getRoot(metadataDB avalanchedatabase.Database, height uint64) (common.Hash,
 	heightBytes := avalanchedatabase.PackUInt64(height)
 	hash, err := metadataDB.Get(heightBytes)
 	switch {
-	case err == avalanchedatabase.ErrNotFound:
+	case errors.Is(err, avalanchedatabase.ErrNotFound):
 		return common.Hash{}, nil
 	case err != nil:
 		return common.Hash{}, err

plugin/evm/atomic_tx_repository.go

@@ -5,6 +5,7 @@ package evm
 
 import (
 	"encoding/binary"
+	"errors"
 	"fmt"
 	"time"
 
@@ -94,12 +95,9 @@ func (a *atomicTxRepository) initializeHeightIndex(lastAcceptedHeight uint64) er
 	// if we are part way through a migration.
 	var lastTxID ids.ID
 	indexHeightBytes, err := a.atomicRepoMetadataDB.Get(maxIndexedHeightKey)
-	switch err {
-	case nil:
-		break
-	case database.ErrNotFound:
-		break
-	default: // unexpected value in the database
+	switch {
+	case errors.Is(err, database.ErrNotFound):
+	case err != nil: // unexpected value in the database
 		return fmt.Errorf("found invalid value at max indexed height: %v", indexHeightBytes)
 	}
 
@@ -274,11 +272,12 @@ func (a *atomicTxRepository) write(height uint64, txs []*atomic.Tx, bonus bool)
 	if len(txs) > 0 {
 		for _, tx := range txs {
 			if bonus {
-				switch _, _, err := a.GetByTxID(tx.ID()); err {
-				case nil:
+				_, _, err := a.GetByTxID(tx.ID())
+				switch {
+				case err == nil:
 					// avoid overwriting existing value if [bonus] is true
 					continue
-				case database.ErrNotFound:
+				case errors.Is(err, database.ErrNotFound):
 					// no existing value to overwrite, proceed as normal
 				default:
 					// unexpected error
@@ -338,7 +337,7 @@ func (a *atomicTxRepository) indexTxsAtHeight(heightBytes []byte, txs []*atomic.
 // by txID into the height -> txs index.
 func (a *atomicTxRepository) appendTxToHeightIndex(heightBytes []byte, tx *atomic.Tx) error {
 	txs, err := a.getByHeightBytes(heightBytes)
-	if err != nil && err != database.ErrNotFound {
+	if err != nil && !errors.Is(err, database.ErrNotFound) {
 		return err
 	}
 

plugin/evm/tx_test.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -51,9 +52,7 @@ func TestCalculateDynamicFee(t *testing.T) {
 				t.Fatalf("Expected value: %d, found: %d", test.expectedValue, cost)
 			}
 		} else {
-			if err != test.expectedErr {
-				t.Fatalf("Expected error: %s, found error: %s", test.expectedErr, err)
-			}
+			assert.ErrorIs(t, err, test.expectedErr)
 		}
 	}
 }

plugin/evm/vm.go

@@ -1523,7 +1523,7 @@ func (vm *VM) CreateStaticHandlers(context.Context) (map[string]http.Handler, er
 func (vm *VM) getAtomicTx(txID ids.ID) (*atomic.Tx, atomic.Status, uint64, error) {
 	if tx, height, err := vm.atomicTxRepository.GetByTxID(txID); err == nil {
 		return tx, atomic.Accepted, height, nil
-	} else if err != database.ErrNotFound {
+	} else if !errors.Is(err, database.ErrNotFound) {
 		return nil, atomic.Unknown, 0, err
 	}
 	tx, dropped, found := vm.mempool.GetTx(txID)
@@ -1752,7 +1752,7 @@ func (vm *VM) readLastAccepted() (common.Hash, uint64, error) {
 	// initialize state with the genesis block.
 	lastAcceptedBytes, lastAcceptedErr := vm.acceptedBlockDB.Get(lastAcceptedKey)
 	switch {
-	case lastAcceptedErr == database.ErrNotFound:
+	case errors.Is(lastAcceptedErr, database.ErrNotFound):
 		// If there is nothing in the database, return the genesis block hash and height
 		return vm.genesisHash, 0, nil
 	case lastAcceptedErr != nil:

plugin/evm/vm_test.go

@@ -1821,9 +1821,8 @@ func TestNonCanonicalAccept(t *testing.T) {
 		t.Fatalf("Block failed verification on VM1: %s", err)
 	}
 
-	if _, err := vm1.GetBlockIDAtHeight(context.Background(), vm1BlkA.Height()); err != database.ErrNotFound {
-		t.Fatalf("Expected unaccepted block not to be indexed by height, but found %s", err)
-	}
+	_, err = vm1.GetBlockIDAtHeight(context.Background(), vm1BlkA.Height())
+	assert.ErrorIs(t, err, database.ErrNotFound, "Expected unaccepted block not to be indexed by height")
 
 	if err := vm1.SetPreference(context.Background(), vm1BlkA.ID()); err != nil {
 		t.Fatal(err)
@@ -1836,9 +1835,8 @@ func TestNonCanonicalAccept(t *testing.T) {
 	if err := vm2BlkA.Verify(context.Background()); err != nil {
 		t.Fatalf("Block failed verification on VM2: %s", err)
 	}
-	if _, err := vm2.GetBlockIDAtHeight(context.Background(), vm2BlkA.Height()); err != database.ErrNotFound {
-		t.Fatalf("Expected unaccepted block not to be indexed by height, but found %s", err)
-	}
+	_, err = vm2.GetBlockIDAtHeight(context.Background(), vm2BlkA.Height())
+	assert.ErrorIs(t, err, database.ErrNotFound, "Expected unaccepted block not to be indexed by height")
 	if err := vm2.SetPreference(context.Background(), vm2BlkA.ID()); err != nil {
 		t.Fatal(err)
 	}
@@ -1902,9 +1900,8 @@ func TestNonCanonicalAccept(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if _, err := vm1.GetBlockIDAtHeight(context.Background(), vm1BlkB.Height()); err != database.ErrNotFound {
-		t.Fatalf("Expected unaccepted block not to be indexed by height, but found %s", err)
-	}
+	_, err = vm1.GetBlockIDAtHeight(context.Background(), vm1BlkB.Height())
+	assert.ErrorIs(t, err, database.ErrNotFound, "Expected unaccepted block not to be indexed by height")
 
 	if err := vm1.SetPreference(context.Background(), vm1BlkB.ID()); err != nil {
 		t.Fatal(err)
@@ -1940,9 +1937,8 @@ func TestNonCanonicalAccept(t *testing.T) {
 		t.Fatalf("Block failed verification on VM1: %s", err)
 	}
 
-	if _, err := vm1.GetBlockIDAtHeight(context.Background(), vm1BlkC.Height()); err != database.ErrNotFound {
-		t.Fatalf("Expected unaccepted block not to be indexed by height, but found %s", err)
-	}
+	_, err = vm1.GetBlockIDAtHeight(context.Background(), vm1BlkC.Height())
+	assert.ErrorIs(t, err, database.ErrNotFound, "Expected unaccepted block not to be indexed by height")
 
 	if err := vm1BlkC.Accept(context.Background()); err != nil {
 		t.Fatalf("VM1 failed to accept block: %s", err)