chore: add extra formatters

Author: Darren Kelly

.golangci.yml

@@ -53,9 +53,14 @@ issues:
 formatters:
   enable:
     - goimports
+    - gofmt
+    - gofumpt
   settings:
     gofmt:
       simplify: true
+    goimports:
+      local-prefixes:
+        - github.com/vechain/thor
   exclusions:
     generated: lax
     paths:

abi/abi.go

@@ -10,6 +10,7 @@ import (
 	"errors"
 
 	ethabi "github.com/ethereum/go-ethereum/accounts/abi"
+
 	"github.com/vechain/thor/v2/thor"
 )
 

abi/abi_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/assert"
+
 	"github.com/vechain/thor/v2/abi"
 	"github.com/vechain/thor/v2/builtin/gen"
 	"github.com/vechain/thor/v2/thor"

abi/event.go

@@ -7,6 +7,7 @@ package abi
 
 import (
 	ethabi "github.com/ethereum/go-ethereum/accounts/abi"
+
 	"github.com/vechain/thor/v2/thor"
 )
 

api/account_types.go

@@ -8,6 +8,7 @@ package api
 import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/common/math"
+
 	"github.com/vechain/thor/v2/runtime"
 	"github.com/vechain/thor/v2/thor"
 )

api/accounts/accounts.go

@@ -15,6 +15,7 @@ import (
 	"github.com/ethereum/go-ethereum/common/math"
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
+
 	"github.com/vechain/thor/v2/api"
 	"github.com/vechain/thor/v2/api/restutil"
 	"github.com/vechain/thor/v2/bft"
@@ -195,7 +196,7 @@ func (a *Accounts) handleCallContract(w http.ResponseWriter, req *http.Request)
 		}
 		addr = &address
 	}
-	var batchCallData = &api.BatchCallData{
+	batchCallData := &api.BatchCallData{
 		Clauses: api.Clauses{
 			&api.Clause{
 				To:    addr,

api/accounts/accounts_test.go

@@ -19,6 +19,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
 	"github.com/vechain/thor/v2/api"
 	"github.com/vechain/thor/v2/block"
 	"github.com/vechain/thor/v2/genesis"
@@ -151,7 +152,7 @@ func getAccount(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, http.StatusBadRequest, statusCode, "bad revision")
 
-	//revision is optional default `best`
+	// revision is optional default `best`
 	res, statusCode, err := tclient.RawHTTPClient().RawHTTPGet("/accounts/" + addr.String())
 	require.NoError(t, err)
 	var acc api.Account
@@ -217,7 +218,7 @@ func getCode(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, http.StatusBadRequest, statusCode, "bad revision")
 
-	//revision is optional defaut `best`
+	// revision is optional defaut `best`
 	res, statusCode, err := tclient.RawHTTPClient().RawHTTPGet("/accounts/" + contractAddr.String() + "/code")
 	require.NoError(t, err)
 	var code map[string]string
@@ -255,7 +256,7 @@ func getStorage(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, http.StatusBadRequest, statusCode, "bad revision")
 
-	//revision is optional defaut `best`
+	// revision is optional defaut `best`
 	res, statusCode, err := tclient.RawHTTPClient().RawHTTPGet("/accounts/" + contractAddr.String() + "/storage/" + storageKey.String())
 	require.NoError(t, err)
 	var value map[string]string
@@ -342,7 +343,7 @@ func deployContractWithCall(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, http.StatusBadRequest, statusCode, "bad revision")
 
-	//revision is optional defaut `best`
+	// revision is optional defaut `best`
 	res, _, err := tclient.RawHTTPClient().RawHTTPPost("/accounts", reqBody)
 	require.NoError(t, err)
 	var output *api.CallResult
@@ -443,7 +444,8 @@ func batchCall(t *testing.T) {
 				To:    &contractAddr,
 				Data:  "data2",
 				Value: nil,
-			}},
+			},
+		},
 	}
 	_, statusCode, err = tclient.RawHTTPClient().RawHTTPPost("/accounts/*", badBody)
 	require.NoError(t, err)
@@ -488,7 +490,8 @@ func batchCall(t *testing.T) {
 				To:    &contractAddr,
 				Data:  hexutil.Encode(input),
 				Value: nil,
-			}},
+			},
+		},
 	}
 
 	// 'next' revisoun should be valid

api/admin/admin.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
+
 	"github.com/vechain/thor/v2/api/admin/apilogs"
 	"github.com/vechain/thor/v2/api/admin/loglevel"
 

api/admin/apilogs/api_logs.go

@@ -11,6 +11,7 @@ import (
 	"sync/atomic"
 
 	"github.com/gorilla/mux"
+
 	"github.com/vechain/thor/v2/api"
 	"github.com/vechain/thor/v2/api/restutil"
 	"github.com/vechain/thor/v2/log"

api/admin/apilogs/api_logs_test.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"
+
 	"github.com/vechain/thor/v2/api"
 )