fix: add 2 lint configs and fix errors

darrenvechain · Jan 12, 2024 · 59dd13f · 59dd13f
1 parent e8c429d
commit 59dd13f
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 35 deletions.
diff --git a/.github/workflows/lint-go.yaml b/.github/workflows/lint-go.yaml
@@ -23,7 +23,8 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           version: v1.54
-          args: --timeout=30m
+          # use the default if on main branch, otherwise use the pull request config
+          args: --timeout=30m --config=${{ github.event_name == 'pull_request' && '.golangci.pull-request.yml' || '.golangci.yml' }}
           only-new-issues: ${{ github.event_name == 'pull_request' }}
           skip-cache: true
           skip-pkg-cache: true

diff --git a/.golangci.pull-request.yml b/.golangci.pull-request.yml
@@ -0,0 +1,13 @@
+# Please refer to the official golangci-lint config documentation for more details:
+# https://golangci-lint.run/usage/configuration/
+# https://github.com/golangci/golangci-lint/blob/master/.golangci.reference.yml
+
+linters:
+  enable-all: true
+
+run:
+  timeout: 10m
+  tests: false
+
+issues:
+  max-issues-per-linter: 1000
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,19 +1,11 @@
-# Please refer to the official golangci-lint config documentation for more details:
-# https://golangci-lint.run/usage/configuration/
-# https://github.com/golangci/golangci-lint/blob/master/.golangci.reference.yml
-
-linters:
-  enable-all: true
-
-linters-settings:
-  gci:
-    sections:
-      - standard
-      - default
-
 run:
   timeout: 10m
   tests: false
 
+linters:
+  disable:
+    - errcheck
+    - unused
+
 issues:
   max-issues-per-linter: 1000
diff --git a/api/accounts/types.go b/api/accounts/types.go
@@ -59,9 +59,7 @@ func convertCallResultWithInputGas(vo *runtime.Output, inputGas uint64) *CallRes
 			Data:    hexutil.Encode(txEvent.Data),
 		}
 		event.Topics = make([]thor.Bytes32, len(txEvent.Topics))
-		for k, topic := range txEvent.Topics {
-			event.Topics[k] = topic
-		}
+		copy(event.Topics, txEvent.Topics)
 		events[j] = event
 	}
 	for j, txTransfer := range vo.Transfers {

diff --git a/api/transactions/types.go b/api/transactions/types.go
@@ -205,9 +205,7 @@ func convertReceipt(txReceipt *tx.Receipt, header *block.Header, tx *tx.Transact
 				Data:    hexutil.Encode(txEvent.Data),
 			}
 			event.Topics = make([]thor.Bytes32, len(txEvent.Topics))
-			for k, topic := range txEvent.Topics {
-				event.Topics[k] = topic
-			}
+			copy(event.Topics, txEvent.Topics)
 			otp.Events[j] = event
 
 		}

diff --git a/cmd/thor/main.go b/cmd/thor/main.go
@@ -8,15 +8,15 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"
 	"time"
 
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/inconshreveable/log15"
-	isatty "github.com/mattn/go-isatty"
+	"github.com/mattn/go-isatty"
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
 	"github.com/vechain/thor/v2/api"
@@ -30,7 +30,7 @@ import (
 	"github.com/vechain/thor/v2/state"
 	"github.com/vechain/thor/v2/thor"
 	"github.com/vechain/thor/v2/txpool"
-	cli "gopkg.in/urfave/cli.v1"
+	"gopkg.in/urfave/cli.v1"
 
 	// Force-load the tracer engines to trigger registration
 	_ "github.com/vechain/thor/v2/tracers/js"
@@ -355,7 +355,7 @@ func masterKeyAction(ctx *cli.Context) error {
 		if isatty.IsTerminal(os.Stdin.Fd()) {
 			fmt.Println("Input JSON keystore (end with ^d):")
 		}
-		keyjson, err := ioutil.ReadAll(os.Stdin)
+		keyjson, err := io.ReadAll(os.Stdin)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/thor/utils.go b/cmd/thor/utils.go
@@ -11,7 +11,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math"
 	"net"
 	"net/http"
@@ -34,7 +33,7 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/nat"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/inconshreveable/log15"
-	tty "github.com/mattn/go-tty"
+	"github.com/mattn/go-tty"
 	"github.com/pkg/errors"
 	"github.com/vechain/thor/v2/api/doc"
 	"github.com/vechain/thor/v2/chain"
@@ -49,7 +48,7 @@ import (
 	"github.com/vechain/thor/v2/thor"
 	"github.com/vechain/thor/v2/tx"
 	"github.com/vechain/thor/v2/txpool"
-	cli "gopkg.in/urfave/cli.v1"
+	"gopkg.in/urfave/cli.v1"
 )
 
 func initLogger(ctx *cli.Context) {
@@ -146,7 +145,7 @@ func handleXGenesisID(h http.Handler, genesisID thor.Bytes32) http.Handler {
 		}
 		w.Header().Set(headerKey, expectedID)
 		if actualID != "" && actualID != expectedID {
-			io.Copy(ioutil.Discard, r.Body)
+			io.Copy(io.Discard, r.Body)
 			http.Error(w, "genesis id mismatch", http.StatusForbidden)
 			return
 		}
@@ -445,7 +444,7 @@ func newP2PComm(ctx *cli.Context, repo *chain.Repository, txPool *txpool.TxPool,
 
 	peersCachePath := filepath.Join(instanceDir, "peers.cache")
 
-	if data, err := ioutil.ReadFile(peersCachePath); err != nil {
+	if data, err := os.ReadFile(peersCachePath); err != nil {
 		if !os.IsNotExist(err) {
 			log.Warn("failed to load peers cache", "err", err)
 		}
@@ -500,7 +499,7 @@ func (p *p2pComm) Stop() {
 		log.Warn("failed to encode cached peers", "err", err)
 		return
 	}
-	if err := ioutil.WriteFile(p.peersCachePath, data, 0600); err != nil {
+	if err := os.WriteFile(p.peersCachePath, data, 0600); err != nil {
 		log.Warn("failed to write peers cache", "err", err)
 	}
 }

diff --git a/p2psrv/bootstrap_nodes.go b/p2psrv/bootstrap_nodes.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 
 	"github.com/ethereum/go-ethereum/p2p/discv5"
@@ -22,7 +21,7 @@ func fetchRemoteBootstrapNodes(ctx context.Context, remoteURL string) ([]*discv5
 		return nil, err
 	}
 	defer resp.Body.Close()
-	defer io.Copy(ioutil.Discard, resp.Body)
+	defer io.Copy(io.Discard, resp.Body)
 
 	if resp.StatusCode != http.StatusOK {
 		return nil, fmt.Errorf("http fetch failed: statusCode=%d", resp.StatusCode)

diff --git a/txpool/blocklist.go b/txpool/blocklist.go
@@ -10,7 +10,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"strings"
@@ -83,7 +82,7 @@ func (bl *blocklist) Fetch(ctx context.Context, url string, eTag *string) error
 		return err
 	}
 	defer resp.Body.Close()
-	defer io.Copy(ioutil.Discard, resp.Body)
+	defer io.Copy(io.Discard, resp.Body)
 
 	if resp.StatusCode == http.StatusNotModified {
 		return nil

diff --git a/vm/bn256/cloudflare/optate.go b/vm/bn256/cloudflare/optate.go
@@ -199,8 +199,10 @@ func miller(q *twistPoint, p *curvePoint) *gfP12 {
 	r = newR
 
 	r2.Square(&minusQ2.y)
+	// nolint: staticcheck
 	a, b, c, newR = lineFunctionAdd(r, minusQ2, bAffine, r2)
 	mulLine(ret, a, b, c)
+	// nolint: staticcheck
 	r = newR
 
 	return ret

diff --git a/vm/contracts.go b/vm/contracts.go
@@ -26,6 +26,7 @@ import (
 	"github.com/ethereum/go-ethereum/common/math"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/params"
+	// nolint:staticcheck
 	"golang.org/x/crypto/ripemd160"
 
 	"github.com/vechain/thor/v2/blake2b"
@@ -473,7 +474,7 @@ func (c *blake2F) Run(input []byte) ([]byte, error) {
 	// Parse the input into the Blake2b call parameters
 	var (
 		rounds = binary.BigEndian.Uint32(input[0:4])
-		final  = (input[212] == blake2FFinalBlockBytes)
+		final  = input[212] == blake2FFinalBlockBytes
 
 		h [8]uint64
 		m [16]uint64