Fix linting errors

.github/workflows/main.yml

@@ -38,7 +38,6 @@ jobs:
             -E makezero
             -E lll
             -E importas
-            -E ifshort
             -E gosec
             -E gofmt
             -E goconst

Makefile

@@ -25,7 +25,7 @@ build:
 .PHONY: lint
 lint:
 	golangci-lint run -E whitespace -E wsl -E wastedassign -E unconvert -E tparallel -E thelper -E stylecheck -E prealloc \
-	-E predeclared -E nlreturn -E misspell -E makezero -E lll -E importas -E ifshort -E gosec -E  gofmt -E goconst \
+	-E predeclared -E nlreturn -E misspell -E makezero -E lll -E importas -E gosec -E  gofmt -E goconst \
 	-E forcetypeassert -E dogsled -E dupl -E errname -E errorlint -E nolintlint --timeout 2m
 
 .PHONY: generate-bsd-licenses

blockchain/blockchain.go

@@ -90,7 +90,6 @@ type Verifier interface {
 	PreStateCommit(header *types.Header, txn *state.Transition) error
 }
 
-// 	TODO: this should be part of Verifier (consensus)
 type Executor interface {
 	ProcessBlock(parentRoot types.Hash, block *types.Block, blockCreator types.Address) (*state.Transition, error)
 }
@@ -106,7 +105,7 @@ func (b *Blockchain) updateGasPriceAvg(newValues []*big.Int) {
 	b.gpAverage.Lock()
 	defer b.gpAverage.Unlock()
 
-	//	Sum the values for quick reference
+	// Sum the values for quick reference
 	sum := big.NewInt(0)
 	for _, val := range newValues {
 		sum = sum.Add(sum, val)
@@ -897,7 +896,7 @@ func (b *Blockchain) WriteBlock(block *types.Block, source string) error {
 		return err
 	}
 
-	//	update snapshot
+	// update snapshot
 	if err := b.consensus.ProcessHeaders([]*types.Header{header}); err != nil {
 		return err
 	}

blockchain/blockchain_test.go

@@ -3,11 +3,12 @@ package blockchain
 import (
 	"errors"
 	"fmt"
-	"github.com/0xPolygon/polygon-edge/state"
 	"math/big"
 	"reflect"
 	"testing"
 
+	"github.com/0xPolygon/polygon-edge/state"
+
 	"github.com/0xPolygon/polygon-edge/chain"
 	"github.com/stretchr/testify/assert"
 

blockchain/subscription.go

@@ -43,8 +43,6 @@ func (m *MockSubscription) GetEvent() *Event {
 func (m *MockSubscription) Close() {
 }
 
-/////////////////////////
-
 // subscription is the Blockchain event subscription object
 type subscription struct {
 	updateCh chan void  // Channel for update information

blockchain/testing.go

@@ -3,10 +3,11 @@ package blockchain
 import (
 	"errors"
 	"fmt"
-	"github.com/0xPolygon/polygon-edge/blockchain/storage"
 	"math/big"
 	"testing"
 
+	"github.com/0xPolygon/polygon-edge/blockchain/storage"
+
 	"github.com/0xPolygon/polygon-edge/chain"
 	"github.com/0xPolygon/polygon-edge/state"
 	itrie "github.com/0xPolygon/polygon-edge/state/immutable-trie"

command/backup/params.go

@@ -2,6 +2,7 @@ package backup
 
 import (
 	"errors"
+
 	"github.com/0xPolygon/polygon-edge/archive"
 	"github.com/0xPolygon/polygon-edge/command"
 	"github.com/0xPolygon/polygon-edge/command/helper"

command/backup/result.go

@@ -3,6 +3,7 @@ package backup
 import (
 	"bytes"
 	"fmt"
+
 	"github.com/0xPolygon/polygon-edge/command/helper"
 )
 

command/common.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"errors"
+
 	"github.com/0xPolygon/polygon-edge/helper/common"
 )
 

command/genesis/genesis.go

@@ -2,6 +2,7 @@ package genesis
 
 import (
 	"fmt"
+
 	"github.com/0xPolygon/polygon-edge/command"
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	"github.com/0xPolygon/polygon-edge/consensus/ibft"

command/genesis/utils.go

@@ -2,15 +2,16 @@ package genesis
 
 import (
 	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+
 	"github.com/0xPolygon/polygon-edge/chain"
 	"github.com/0xPolygon/polygon-edge/command"
 	"github.com/0xPolygon/polygon-edge/consensus/ibft"
 	"github.com/0xPolygon/polygon-edge/crypto"
 	"github.com/0xPolygon/polygon-edge/types"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
 )
 
 const (

command/ibft/candidates/ibft_candidates.go

@@ -2,6 +2,7 @@ package candidates
 
 import (
 	"context"
+
 	"github.com/0xPolygon/polygon-edge/command"
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	ibftOp "github.com/0xPolygon/polygon-edge/consensus/ibft/proto"

command/ibft/candidates/result.go

@@ -3,6 +3,7 @@ package candidates
 import (
 	"bytes"
 	"fmt"
+
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	ibftHelper "github.com/0xPolygon/polygon-edge/command/ibft/helper"
 	ibftOp "github.com/0xPolygon/polygon-edge/consensus/ibft/proto"

command/ibft/propose/params.go

@@ -3,6 +3,7 @@ package propose
 import (
 	"context"
 	"errors"
+
 	ibftOp "github.com/0xPolygon/polygon-edge/consensus/ibft/proto"
 
 	"github.com/0xPolygon/polygon-edge/command"

command/ibft/quorum/params.go

@@ -3,11 +3,12 @@ package quorum
 import (
 	"errors"
 	"fmt"
+	"os"
+
 	"github.com/0xPolygon/polygon-edge/chain"
 	"github.com/0xPolygon/polygon-edge/command"
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	"github.com/0xPolygon/polygon-edge/helper/common"
-	"os"
 )
 
 const (

command/ibft/quorum/result.go

@@ -3,6 +3,7 @@ package quorum
 import (
 	"bytes"
 	"fmt"
+
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	"github.com/0xPolygon/polygon-edge/helper/common"
 )

command/ibft/snapshot/params.go

@@ -2,6 +2,7 @@ package snapshot
 
 import (
 	"context"
+
 	"github.com/0xPolygon/polygon-edge/command"
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	ibftOp "github.com/0xPolygon/polygon-edge/consensus/ibft/proto"

command/ibft/snapshot/result.go

@@ -3,6 +3,7 @@ package snapshot
 import (
 	"bytes"
 	"fmt"
+
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	ibftHelper "github.com/0xPolygon/polygon-edge/command/ibft/helper"
 	ibftOp "github.com/0xPolygon/polygon-edge/consensus/ibft/proto"

command/ibft/status/ibft_status.go

@@ -2,6 +2,7 @@ package status
 
 import (
 	"context"
+
 	"github.com/0xPolygon/polygon-edge/command"
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	ibftOp "github.com/0xPolygon/polygon-edge/consensus/ibft/proto"

command/ibft/status/result.go

@@ -3,6 +3,7 @@ package status
 import (
 	"bytes"
 	"fmt"
+
 	"github.com/0xPolygon/polygon-edge/command/helper"
 )
 

command/ibft/switch/params.go

@@ -3,13 +3,14 @@ package ibftswitch
 import (
 	"errors"
 	"fmt"
+	"os"
+
 	"github.com/0xPolygon/polygon-edge/chain"
 	"github.com/0xPolygon/polygon-edge/command"
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	"github.com/0xPolygon/polygon-edge/consensus/ibft"
 	"github.com/0xPolygon/polygon-edge/helper/common"
 	"github.com/0xPolygon/polygon-edge/types"
-	"os"
 )
 
 const (

command/ibft/switch/result.go

@@ -3,6 +3,7 @@ package ibftswitch
 import (
 	"bytes"
 	"fmt"
+
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	"github.com/0xPolygon/polygon-edge/consensus/ibft"
 	"github.com/0xPolygon/polygon-edge/helper/common"

command/license/result.go

@@ -3,6 +3,7 @@ package license
 import (
 	"bytes"
 	"fmt"
+
 	"github.com/0xPolygon/polygon-edge/licenses"
 )
 

command/loadbot/duration.go

@@ -1,10 +1,11 @@
 package loadbot
 
 import (
-	"github.com/umbracle/ethgo"
 	"sync"
 	"sync/atomic"
 	"time"
+
+	"github.com/umbracle/ethgo"
 )
 
 type ExecDuration struct {

command/loadbot/execution.go

@@ -4,12 +4,13 @@ import (
 	"context"
 	"crypto/ecdsa"
 	"fmt"
-	"github.com/umbracle/ethgo"
 	"math/big"
 	"sync"
 	"sync/atomic"
 	"time"
 
+	"github.com/umbracle/ethgo"
+
 	"github.com/0xPolygon/polygon-edge/command/loadbot/generator"
 	"github.com/0xPolygon/polygon-edge/helper/tests"
 	txpoolOp "github.com/0xPolygon/polygon-edge/txpool/proto"

command/loadbot/generator/contract_txn_generator.go

@@ -19,12 +19,12 @@ type ContractTxnsGenerator struct {
 	failedContractTxnsLock sync.RWMutex
 }
 
-//	Returns contract deployment tx if contractAddress is empty, otherwise returns
-//	a token transfer tx
+// Returns contract deployment tx if contractAddress is empty, otherwise returns
+// a token transfer tx
 func (gen *ContractTxnsGenerator) GetExampleTransaction() (*types.Transaction, error) {
 	if gen.contractAddress == nil {
-		//	contract not deployed yet
-		//	generate contract deployment tx
+		// contract not deployed yet
+		// generate contract deployment tx
 		return gen.signer.SignTx(&types.Transaction{
 			From:     gen.params.SenderAddress,
 			Value:    big.NewInt(0),
@@ -34,7 +34,7 @@ func (gen *ContractTxnsGenerator) GetExampleTransaction() (*types.Transaction, e
 		}, gen.params.SenderKey)
 	}
 
-	//	return token transfer tx
+	// return token transfer tx
 	return gen.signer.SignTx(&types.Transaction{
 		From:     gen.params.SenderAddress,
 		To:       gen.contractAddress,
@@ -49,8 +49,8 @@ func (gen *ContractTxnsGenerator) GenerateTransaction() (*types.Transaction, err
 	newNextNonce := atomic.AddUint64(&gen.params.Nonce, 1)
 
 	if gen.contractAddress == nil {
-		//	contract not deployed yet
-		//	generate contract deployment tx
+		// contract not deployed yet
+		// generate contract deployment tx
 		return gen.signer.SignTx(&types.Transaction{
 			From:     gen.params.SenderAddress,
 			Value:    big.NewInt(0),
@@ -62,7 +62,7 @@ func (gen *ContractTxnsGenerator) GenerateTransaction() (*types.Transaction, err
 		}, gen.params.SenderKey)
 	}
 
-	//	return token transfer tx
+	// return token transfer tx
 	return gen.signer.SignTx(&types.Transaction{
 		From:     gen.params.SenderAddress,
 		To:       gen.contractAddress,

command/loadbot/generator/generator.go

@@ -3,10 +3,11 @@ package generator
 import (
 	"crypto/ecdsa"
 	"encoding/json"
-	"github.com/umbracle/ethgo"
 	"io/ioutil"
 	"math/big"
 
+	"github.com/umbracle/ethgo"
+
 	"github.com/0xPolygon/polygon-edge/types"
 	"github.com/umbracle/ethgo/abi"
 )

command/loadbot/helper.go

@@ -2,11 +2,12 @@ package loadbot
 
 import (
 	"fmt"
-	"github.com/umbracle/ethgo"
 	"math/big"
 	"sync"
 	"time"
 
+	"github.com/umbracle/ethgo"
+
 	"github.com/0xPolygon/polygon-edge/types"
 	"github.com/umbracle/ethgo/jsonrpc"
 )

command/loadbot/result.go

@@ -3,10 +3,11 @@ package loadbot
 import (
 	"bytes"
 	"fmt"
-	"github.com/umbracle/ethgo"
 	"math"
 	"sort"
 
+	"github.com/umbracle/ethgo"
+
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	"github.com/0xPolygon/polygon-edge/command/loadbot/generator"
 	"github.com/0xPolygon/polygon-edge/helper/common"
@@ -139,7 +140,6 @@ func (lr *LoadbotResult) initDetailedErrors(gen generator.TransactionGenerator)
 }
 
 func (lr *LoadbotResult) writeBlockData(buffer *bytes.Buffer) {
-	//nolint: ifshort
 	blockData := &lr.BlockData
 
 	buffer.WriteString("\n\n[BLOCK DATA]\n")

command/monitor/monitor.go

@@ -4,10 +4,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"io"
+
 	"github.com/0xPolygon/polygon-edge/command"
 	"github.com/0xPolygon/polygon-edge/helper/common"
 	"github.com/spf13/cobra"
-	"io"
 
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	"github.com/0xPolygon/polygon-edge/server/proto"

command/monitor/result.go

@@ -3,6 +3,7 @@ package monitor
 import (
 	"bytes"
 	"fmt"
+
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	"github.com/0xPolygon/polygon-edge/server/proto"
 )

command/peers/add/params.go

@@ -3,6 +3,7 @@ package add
 import (
 	"context"
 	"errors"
+
 	"github.com/0xPolygon/polygon-edge/command"
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	"github.com/0xPolygon/polygon-edge/server/proto"