tweak golangci-lint conf

.github/workflows/lint-go.yaml

@@ -24,7 +24,7 @@ jobs:
         with:
           version: v1.54
           # 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' }}
+          args: --timeout=30m --config=.golangci.yml
           only-new-issues: true
           skip-cache: true
           skip-pkg-cache: true

.github/workflows/test-docker-build.yaml

@@ -1,4 +1,4 @@
-name: Docker
+name: Test Docker Buld
 
 on:
   push:

.github/workflows/test.yaml

@@ -1,4 +1,4 @@
-name: Test
+name: Unit Tests
 
 on: [push, pull_request]
 

.golangci.yml

@@ -1,22 +1,45 @@
 # 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
+run:
+  timeout: 10m
+  tests: true
+  # default is true. Enables skipping of directories:
+  #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
+  skip-dirs-use-default: true
 
 linters:
-  disable:
+  disable-all: true
+  enable:
+    - goimports
+    - gosimple
+    - govet
+    - ineffassign
+    - misspell
+    - unconvert
+    - typecheck
     - unused
-    - errcheck
+    - staticcheck
+    - bidichk
+    - durationcheck
+    - exportloopref
+    - whitespace
 
-run:
-  timeout: 10m
-  tests: false
+    # - structcheck # lots of false positives
+    # - errcheck #lot of false positives
+    # - contextcheck
+    # - errchkjson # lots of false positives
+    # - errorlint # this check crashes
+    # - exhaustive # silly check
+    # - makezero # false positives
+    # - nilerr # several intentional
+
+linters-settings:
+  gofmt:
+    simplify: true
 
 issues:
   max-issues-per-linter: 1000
   exclude-rules:
     - path: vm/contracts.go
       text: 'SA1019: "golang.org/x/crypto/ripemd160" is deprecated: RIPEMD-160 is a legacy hash and should not be used for new applications.'
-    - path: vm/bn256/cloudflare/optate.go
-      linters:
-        - deadcode
-        - staticcheck

Makefile

@@ -57,8 +57,5 @@ test-coverage:| go_version_check #@ Run the tests with coverage
 lint_command_check:
 	@command -v golangci-lint || (echo "golangci-lint not found, please install it from https://golangci-lint.run/usage/install/" && exit 1)
 
-lint: | go_version_check lint_command_check #@ Run 'golangci-lint' on new code changes
-	@golangci-lint run --new --config .golangci.pull-request.yml
-
-lint-all: | go_version_check lint_command_check #@ Run 'golangci-lint' on the entire codebase
+lint: | go_version_check lint_command_check #@ Run 'golangci-lint'
 	@golangci-lint run --config .golangci.yml

abi/abi_test.go

@@ -81,6 +81,5 @@ func TestABI(t *testing.T) {
 		assert.Nil(t, err)
 
 		assert.Equal(t, value, d)
-
 	}
 }

api/accounts/accounts.go

@@ -355,5 +355,4 @@ func (a *Accounts) Mount(root *mux.Router, pathPrefix string) {
 	sub.Path("/{address}/storage/{key}").Methods("GET").HandlerFunc(utils.WrapHandlerFunc(a.handleGetStorage))
 	sub.Path("").Methods("POST").HandlerFunc(utils.WrapHandlerFunc(a.handleCallContract))
 	sub.Path("/{address}").Methods("POST").HandlerFunc(utils.WrapHandlerFunc(a.handleCallContract))
-
 }

api/accounts/accounts_test.go

@@ -8,7 +8,7 @@ package accounts_test
 import (
 	"bytes"
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"math/big"
 	"net/http"
 	"net/http/httptest"
@@ -32,16 +32,16 @@ import (
 	"github.com/vechain/thor/v2/tx"
 )
 
-var sol = `	pragma solidity ^0.4.18;
-			contract Test {
-    			uint8 value;
-    			function add(uint8 a,uint8 b) public pure returns(uint8) {
-        			return a+b;
-    			}
-    			function set(uint8 v) public {
-        			value = v;
-    			}
-			}`
+// pragma solidity ^0.4.18;
+// contract Test {
+// 	uint8 value;
+// 	function add(uint8 a,uint8 b) public pure returns(uint8) {
+// 		return a+b;
+// 	}
+// 	function set(uint8 v) public {
+// 		value = v;
+// 	}
+// }
 
 var abiJSON = `[
 	{
@@ -111,32 +111,31 @@ func TestAccount(t *testing.T) {
 }
 
 func getAccount(t *testing.T) {
-	res, statusCode := httpGet(t, ts.URL+"/accounts/"+invalidAddr)
+	_, statusCode := httpGet(t, ts.URL+"/accounts/"+invalidAddr)
 	assert.Equal(t, http.StatusBadRequest, statusCode, "bad address")
 
-	res, statusCode = httpGet(t, ts.URL+"/accounts/"+addr.String()+"?revision="+invalidNumberRevision)
+	_, statusCode = httpGet(t, ts.URL+"/accounts/"+addr.String()+"?revision="+invalidNumberRevision)
 	assert.Equal(t, http.StatusBadRequest, statusCode, "bad revision")
 
 	//revision is optional defaut `best`
-	res, statusCode = httpGet(t, ts.URL+"/accounts/"+addr.String())
+	res, statusCode := httpGet(t, ts.URL+"/accounts/"+addr.String())
 	var acc accounts.Account
 	if err := json.Unmarshal(res, &acc); err != nil {
 		t.Fatal(err)
 	}
 	assert.Equal(t, math.HexOrDecimal256(*value), acc.Balance, "balance should be equal")
 	assert.Equal(t, http.StatusOK, statusCode, "OK")
-
 }
 
 func getCode(t *testing.T) {
-	res, statusCode := httpGet(t, ts.URL+"/accounts/"+invalidAddr+"/code")
+	_, statusCode := httpGet(t, ts.URL+"/accounts/"+invalidAddr+"/code")
 	assert.Equal(t, http.StatusBadRequest, statusCode, "bad address")
 
-	res, statusCode = httpGet(t, ts.URL+"/accounts/"+contractAddr.String()+"/code?revision="+invalidNumberRevision)
+	_, statusCode = httpGet(t, ts.URL+"/accounts/"+contractAddr.String()+"/code?revision="+invalidNumberRevision)
 	assert.Equal(t, http.StatusBadRequest, statusCode, "bad revision")
 
 	//revision is optional defaut `best`
-	res, statusCode = httpGet(t, ts.URL+"/accounts/"+contractAddr.String()+"/code")
+	res, statusCode := httpGet(t, ts.URL+"/accounts/"+contractAddr.String()+"/code")
 	var code map[string]string
 	if err := json.Unmarshal(res, &code); err != nil {
 		t.Fatal(err)
@@ -150,17 +149,17 @@ func getCode(t *testing.T) {
 }
 
 func getStorage(t *testing.T) {
-	res, statusCode := httpGet(t, ts.URL+"/accounts/"+invalidAddr+"/storage/"+storageKey.String())
+	_, statusCode := httpGet(t, ts.URL+"/accounts/"+invalidAddr+"/storage/"+storageKey.String())
 	assert.Equal(t, http.StatusBadRequest, statusCode, "bad address")
 
-	res, statusCode = httpGet(t, ts.URL+"/accounts/"+contractAddr.String()+"/storage/"+invalidBytes32)
+	_, statusCode = httpGet(t, ts.URL+"/accounts/"+contractAddr.String()+"/storage/"+invalidBytes32)
 	assert.Equal(t, http.StatusBadRequest, statusCode, "bad storage key")
 
-	res, statusCode = httpGet(t, ts.URL+"/accounts/"+contractAddr.String()+"/storage/"+storageKey.String()+"?revision="+invalidNumberRevision)
+	_, statusCode = httpGet(t, ts.URL+"/accounts/"+contractAddr.String()+"/storage/"+storageKey.String()+"?revision="+invalidNumberRevision)
 	assert.Equal(t, http.StatusBadRequest, statusCode, "bad revision")
 
 	//revision is optional defaut `best`
-	res, statusCode = httpGet(t, ts.URL+"/accounts/"+contractAddr.String()+"/storage/"+storageKey.String())
+	res, statusCode := httpGet(t, ts.URL+"/accounts/"+contractAddr.String()+"/storage/"+storageKey.String())
 	var value map[string]string
 	if err := json.Unmarshal(res, &value); err != nil {
 		t.Fatal(err)
@@ -190,9 +189,9 @@ func initAccountServer(t *testing.T) {
 	packTx(repo, stater, transaction, t)
 
 	method := "set"
-	abi, err := ABI.New([]byte(abiJSON))
+	abi, _ := ABI.New([]byte(abiJSON))
 	m, _ := abi.MethodByName(method)
-	input, err := m.EncodeInput(uint8(storageValue))
+	input, err := m.EncodeInput(storageValue)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -252,41 +251,40 @@ func deployContractWithCall(t *testing.T) {
 		Gas:  10000000,
 		Data: "abc",
 	}
-	res, statusCode := httpPost(t, ts.URL+"/accounts", badBody)
+	_, statusCode := httpPost(t, ts.URL+"/accounts", badBody)
 	assert.Equal(t, http.StatusBadRequest, statusCode, "bad data")
 
 	reqBody := &accounts.CallData{
 		Gas:  10000000,
 		Data: hexutil.Encode(bytecode),
 	}
 
-	res, statusCode = httpPost(t, ts.URL+"/accounts?revision="+invalidNumberRevision, reqBody)
+	_, statusCode = httpPost(t, ts.URL+"/accounts?revision="+invalidNumberRevision, reqBody)
 	assert.Equal(t, http.StatusBadRequest, statusCode, "bad revision")
 
 	//revision is optional defaut `best`
-	res, statusCode = httpPost(t, ts.URL+"/accounts", reqBody)
+	res, _ := httpPost(t, ts.URL+"/accounts", reqBody)
 	var output *accounts.CallResult
 	if err := json.Unmarshal(res, &output); err != nil {
 		t.Fatal(err)
 	}
 	assert.False(t, output.Reverted)
-
 }
 
 func callContract(t *testing.T) {
-	res, statusCode := httpPost(t, ts.URL+"/accounts/"+invalidAddr, nil)
+	_, statusCode := httpPost(t, ts.URL+"/accounts/"+invalidAddr, nil)
 	assert.Equal(t, http.StatusBadRequest, statusCode, "invalid address")
 
 	badBody := &accounts.CallData{
 		Data: "input",
 	}
-	res, statusCode = httpPost(t, ts.URL+"/accounts/"+contractAddr.String(), badBody)
+	_, statusCode = httpPost(t, ts.URL+"/accounts/"+contractAddr.String(), badBody)
 	assert.Equal(t, http.StatusBadRequest, statusCode, "invalid input data")
 
 	a := uint8(1)
 	b := uint8(2)
 	method := "add"
-	abi, err := ABI.New([]byte(abiJSON))
+	abi, _ := ABI.New([]byte(abiJSON))
 	m, _ := abi.MethodByName(method)
 	input, err := m.EncodeInput(a, b)
 	if err != nil {
@@ -295,7 +293,7 @@ func callContract(t *testing.T) {
 	reqBody := &accounts.CallData{
 		Data: hexutil.Encode(input),
 	}
-	res, statusCode = httpPost(t, ts.URL+"/accounts/"+contractAddr.String(), reqBody)
+	res, statusCode := httpPost(t, ts.URL+"/accounts/"+contractAddr.String(), reqBody)
 	var output *accounts.CallResult
 	if err = json.Unmarshal(res, &output); err != nil {
 		t.Fatal(err)
@@ -327,13 +325,13 @@ func batchCall(t *testing.T) {
 				Value: nil,
 			}},
 	}
-	res, statusCode := httpPost(t, ts.URL+"/accounts/*", badBody)
+	_, statusCode := httpPost(t, ts.URL+"/accounts/*", badBody)
 	assert.Equal(t, http.StatusBadRequest, statusCode, "invalid data")
 
 	a := uint8(1)
 	b := uint8(2)
 	method := "add"
-	abi, err := ABI.New([]byte(abiJSON))
+	abi, _ := ABI.New([]byte(abiJSON))
 	m, _ := abi.MethodByName(method)
 	input, err := m.EncodeInput(a, b)
 	if err != nil {
@@ -353,10 +351,10 @@ func batchCall(t *testing.T) {
 			}},
 	}
 
-	res, statusCode = httpPost(t, ts.URL+"/accounts/*?revision="+invalidNumberRevision, badBody)
+	_, statusCode = httpPost(t, ts.URL+"/accounts/*?revision="+invalidNumberRevision, badBody)
 	assert.Equal(t, http.StatusBadRequest, statusCode, "invalid revision")
 
-	res, statusCode = httpPost(t, ts.URL+"/accounts/*", reqBody)
+	res, statusCode := httpPost(t, ts.URL+"/accounts/*", reqBody)
 	var results accounts.BatchCallResults
 	if err = json.Unmarshal(res, &results); err != nil {
 		t.Fatal(err)
@@ -399,7 +397,7 @@ func httpPost(t *testing.T, url string, body interface{}) ([]byte, int) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	r, err := ioutil.ReadAll(res.Body)
+	r, err := io.ReadAll(res.Body)
 	res.Body.Close()
 	if err != nil {
 		t.Fatal(err)
@@ -412,7 +410,7 @@ func httpGet(t *testing.T, url string) ([]byte, int) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	r, err := ioutil.ReadAll(res.Body)
+	r, err := io.ReadAll(res.Body)
 	res.Body.Close()
 	if err != nil {
 		t.Fatal(err)

api/api.go

@@ -44,7 +44,6 @@ func New(
 	allowCustomTracer bool,
 	forkConfig thor.ForkConfig,
 ) (http.HandlerFunc, func()) {
-
 	origins := strings.Split(strings.TrimSpace(allowedOrigins), ",")
 	for i, o := range origins {
 		origins[i] = strings.ToLower(strings.TrimSpace(o))