all: fix goimports (#1560)

contracts/XDCx/simulation/fee/lending/main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"fmt"
-	"github.com/XinFinOrg/XDPoSChain/contracts/XDCx/simulation"
 	"math/big"
 	"os"
 	"strconv"
@@ -12,6 +11,7 @@ import (
 	"github.com/XinFinOrg/XDPoSChain/accounts/abi/bind"
 	"github.com/XinFinOrg/XDPoSChain/common"
 	"github.com/XinFinOrg/XDPoSChain/contracts/XDCx"
+	"github.com/XinFinOrg/XDPoSChain/contracts/XDCx/simulation"
 	"github.com/XinFinOrg/XDPoSChain/crypto"
 	"github.com/XinFinOrg/XDPoSChain/ethclient"
 )

contracts/XDCx/trc21.go

@@ -1,10 +1,11 @@
 package XDCx
 
 import (
+	"math/big"
+
 	"github.com/XinFinOrg/XDPoSChain/accounts/abi/bind"
 	"github.com/XinFinOrg/XDPoSChain/common"
 	"github.com/XinFinOrg/XDPoSChain/contracts/XDCx/contract"
-	"math/big"
 )
 
 type MyTRC21 struct {

contracts/XDCx/trc21Issuer.go

@@ -1,10 +1,11 @@
 package XDCx
 
 import (
+	"math/big"
+
 	"github.com/XinFinOrg/XDPoSChain/accounts/abi/bind"
 	"github.com/XinFinOrg/XDPoSChain/common"
 	"github.com/XinFinOrg/XDPoSChain/contracts/XDCx/contract"
-	"math/big"
 )
 
 type TRC21Issuer struct {

contracts/blocksigner/blocksigner.go

@@ -16,10 +16,11 @@
 package blocksigner
 
 import (
+	"math/big"
+
 	"github.com/XinFinOrg/XDPoSChain/accounts/abi/bind"
 	"github.com/XinFinOrg/XDPoSChain/common"
 	"github.com/XinFinOrg/XDPoSChain/contracts/blocksigner/contract"
-	"math/big"
 )
 
 type BlockSigner struct {

contracts/trc21issuer/simulation/common.go

@@ -1,8 +1,9 @@
 package simulation
 
 import (
-	"github.com/XinFinOrg/XDPoSChain/crypto"
 	"math/big"
+
+	"github.com/XinFinOrg/XDPoSChain/crypto"
 )
 
 var (

contracts/trc21issuer/trc21.go

@@ -1,10 +1,11 @@
 package trc21issuer
 
 import (
+	"math/big"
+
 	"github.com/XinFinOrg/XDPoSChain/accounts/abi/bind"
 	"github.com/XinFinOrg/XDPoSChain/common"
 	"github.com/XinFinOrg/XDPoSChain/contracts/trc21issuer/contract"
-	"math/big"
 )
 
 type MyTRC21 struct {

contracts/trc21issuer/trc21issuer.go

@@ -1,10 +1,11 @@
 package trc21issuer
 
 import (
+	"math/big"
+
 	"github.com/XinFinOrg/XDPoSChain/accounts/abi/bind"
 	"github.com/XinFinOrg/XDPoSChain/common"
 	"github.com/XinFinOrg/XDPoSChain/contracts/trc21issuer/contract"
-	"math/big"
 )
 
 type TRC21Issuer struct {

contracts/validator/validator.go

@@ -46,7 +46,7 @@ func NewValidator(transactOpts *bind.TransactOpts, contractAddr common.Address,
 func DeployValidator(transactOpts *bind.TransactOpts, contractBackend bind.ContractBackend, validatorAddress []common.Address, caps []*big.Int, ownerAddress common.Address, minDeposit *big.Int, minVoterCap *big.Int) (common.Address, *Validator, error) {
 	if minDeposit == nil {
 		minDeposit = new(big.Int)
-		minDeposit.SetString("10000000", 10) // 10M
+		minDeposit.SetString("10000000", 10)         // 10M
 		minDeposit.Mul(minDeposit, big.NewInt(1e18)) //convert to wei
 	}
 	if minVoterCap == nil {

core/chain_makers_test.go

@@ -18,10 +18,10 @@ package core
 
 import (
 	"fmt"
-	"github.com/XinFinOrg/XDPoSChain/core/rawdb"
 	"math/big"
 
 	"github.com/XinFinOrg/XDPoSChain/consensus/ethash"
+	"github.com/XinFinOrg/XDPoSChain/core/rawdb"
 	"github.com/XinFinOrg/XDPoSChain/core/types"
 	"github.com/XinFinOrg/XDPoSChain/core/vm"
 	"github.com/XinFinOrg/XDPoSChain/crypto"

eth/bft/bft_handler.go

@@ -153,7 +153,7 @@ func (b *Bfter) SyncInfo(peer string, syncInfo *types.SyncInfo) error {
 		log.Debug("[SyncInfo] Received SyncInfo", "qcRound", syncInfo.HighestQuorumCert.ProposedBlockInfo.Round, "qcBlocknum", syncInfo.HighestQuorumCert.ProposedBlockInfo.Number, "qcBlockhash", syncInfo.HighestQuorumCert.ProposedBlockInfo.Hash.Hex())
 	}
 	if syncInfo.HighestTimeoutCert != nil {
-		log.Debug("[SyncInfo] Received SyncInfo", "tcRound", syncInfo.HighestTimeoutCert.Round) 
+		log.Debug("[SyncInfo] Received SyncInfo", "tcRound", syncInfo.HighestTimeoutCert.Round)
 	}
 
 	qcBlockNum := syncInfo.HighestQuorumCert.ProposedBlockInfo.Number.Int64()

tests/vm_test.go

@@ -17,10 +17,10 @@
 package tests
 
 import (
-	"github.com/XinFinOrg/XDPoSChain/common"
 	"math/big"
 	"testing"
 
+	"github.com/XinFinOrg/XDPoSChain/common"
 	"github.com/XinFinOrg/XDPoSChain/core/vm"
 )