Tidy with gci

api/api_ethereum.go

@@ -29,9 +29,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/kaiachain/kaia/rlp"
-	"github.com/kaiachain/kaia/storage/statedb"
-
 	"github.com/kaiachain/kaia/blockchain"
 	"github.com/kaiachain/kaia/blockchain/state"
 	"github.com/kaiachain/kaia/blockchain/types"
@@ -43,6 +40,8 @@ import (
 	"github.com/kaiachain/kaia/networks/rpc"
 	"github.com/kaiachain/kaia/node/cn/filters"
 	"github.com/kaiachain/kaia/params"
+	"github.com/kaiachain/kaia/rlp"
+	"github.com/kaiachain/kaia/storage/statedb"
 )
 
 const (

blockchain/blockchain.go

@@ -35,8 +35,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/kaiachain/kaia/snapshot"
-
 	"github.com/go-redis/redis/v7"
 	lru "github.com/hashicorp/golang-lru"
 	"github.com/kaiachain/kaia/blockchain/state"
@@ -54,6 +52,7 @@ import (
 	kaiametrics "github.com/kaiachain/kaia/metrics"
 	"github.com/kaiachain/kaia/params"
 	"github.com/kaiachain/kaia/rlp"
+	"github.com/kaiachain/kaia/snapshot"
 	"github.com/kaiachain/kaia/storage/database"
 	"github.com/kaiachain/kaia/storage/statedb"
 	"github.com/rcrowley/go-metrics"

blockchain/blockchain_test.go

@@ -49,7 +49,6 @@ import (
 	"github.com/kaiachain/kaia/storage"
 	"github.com/kaiachain/kaia/storage/database"
 	"github.com/kaiachain/kaia/storage/statedb"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

blockchain/spam_throttler.go

@@ -23,10 +23,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/rcrowley/go-metrics"
-
 	"github.com/kaiachain/kaia/blockchain/types"
 	"github.com/kaiachain/kaia/common"
+	"github.com/rcrowley/go-metrics"
 )
 
 // TODO-Kaia: move these variables into TxPool when BlockChain struct contains a TxPool interface

blockchain/state_migration.go

@@ -27,11 +27,10 @@ import (
 	"time"
 
 	"github.com/VictoriaMetrics/fastcache"
-	"github.com/kaiachain/kaia/blockchain/types"
-
 	"github.com/alecthomas/units"
 	lru "github.com/hashicorp/golang-lru"
 	"github.com/kaiachain/kaia/blockchain/state"
+	"github.com/kaiachain/kaia/blockchain/types"
 	"github.com/kaiachain/kaia/common"
 	"github.com/kaiachain/kaia/common/mclock"
 	"github.com/kaiachain/kaia/log"

blockchain/types/block_test.go

@@ -29,11 +29,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-
 	"github.com/kaiachain/kaia/common"
 	"github.com/kaiachain/kaia/common/hexutil"
 	"github.com/kaiachain/kaia/rlp"
+	"github.com/stretchr/testify/assert"
 )
 
 type testBlockEncodingTC struct {

blockchain/types/transaction_signing_test.go

@@ -31,11 +31,10 @@ import (
 	"testing"
 
 	"github.com/kaiachain/kaia/blockchain/types/accountkey"
-	"github.com/stretchr/testify/assert"
-
 	"github.com/kaiachain/kaia/common"
 	"github.com/kaiachain/kaia/crypto"
 	"github.com/kaiachain/kaia/rlp"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestLondonSigningWithoutChainID(t *testing.T) {

blockchain/types/tx_internal_data_serializer_test.go

@@ -23,13 +23,12 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-
 	"github.com/kaiachain/kaia/blockchain/types/accountkey"
 	"github.com/kaiachain/kaia/common"
 	"github.com/kaiachain/kaia/common/hexutil"
 	"github.com/kaiachain/kaia/params"
 	"github.com/kaiachain/kaia/rlp"
+	"github.com/stretchr/testify/assert"
 )
 
 var (

blockchain/types/tx_internal_rlp_encode_test.go

@@ -29,11 +29,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/kaiachain/kaia/crypto/sha3"
-
 	"github.com/kaiachain/kaia/blockchain/types/accountkey"
 	"github.com/kaiachain/kaia/common"
 	"github.com/kaiachain/kaia/crypto"
+	"github.com/kaiachain/kaia/crypto/sha3"
 	"github.com/kaiachain/kaia/params"
 	"github.com/kaiachain/kaia/rlp"
 	"github.com/stretchr/testify/assert"

blockchain/vm/internaltx_trace_json_test.go

@@ -33,9 +33,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
-
 	"github.com/kaiachain/kaia/common"
+	"github.com/stretchr/testify/assert"
 )
 
 func jsonMustCompact(data []byte) []byte {

cmd/homi/genesis/options.go

@@ -21,16 +21,15 @@ import (
 	"math/big"
 	"strings"
 
+	"github.com/kaiachain/kaia/blockchain"
 	"github.com/kaiachain/kaia/blockchain/system"
 	"github.com/kaiachain/kaia/cmd/homi/extra"
+	"github.com/kaiachain/kaia/common"
+	"github.com/kaiachain/kaia/common/hexutil"
 	"github.com/kaiachain/kaia/consensus/clique"
 	testcontract "github.com/kaiachain/kaia/contracts/contracts/testing/reward"
 	"github.com/kaiachain/kaia/log"
 	"github.com/kaiachain/kaia/params"
-
-	"github.com/kaiachain/kaia/blockchain"
-	"github.com/kaiachain/kaia/common"
-	"github.com/kaiachain/kaia/common/hexutil"
 )
 
 type Option func(*blockchain.Genesis)

cmd/utils/flaggroup_test.go

@@ -22,7 +22,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-
 	"github.com/urfave/cli/v2"
 )
 

consensus/gxhash/consensus_test.go

@@ -26,14 +26,7 @@ import (
 	"encoding/json"
 	"math/big"
 
-	// Enable below packages when enabling TestCalcDiffulty
-	// "os"
-	// "path/filepath"
-	// "testing"
-
 	"github.com/kaiachain/kaia/common/math"
-	// "github.com/kaiachain/kaia/blockchain/types"
-	// "github.com/kaiachain/kaia/params"
 )
 
 type diffTest struct {

consensus/gxhash/gxhash.go

@@ -37,14 +37,13 @@ import (
 	"time"
 	"unsafe"
 
+	mmap "github.com/edsrzf/mmap-go"
 	"github.com/hashicorp/golang-lru/simplelru"
+	"github.com/kaiachain/kaia/common"
 	"github.com/kaiachain/kaia/consensus"
 	"github.com/kaiachain/kaia/log"
 	"github.com/kaiachain/kaia/networks/rpc"
 	"github.com/rcrowley/go-metrics"
-
-	mmap "github.com/edsrzf/mmap-go"
-	"github.com/kaiachain/kaia/common"
 )
 
 var ErrInvalidDumpMagic = errors.New("invalid dump magic")

consensus/istanbul/backend/handler_test.go

@@ -22,13 +22,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
-
 	lru "github.com/hashicorp/golang-lru"
 	"github.com/kaiachain/kaia/common"
 	"github.com/kaiachain/kaia/consensus/istanbul"
 	"github.com/kaiachain/kaia/networks/p2p"
 	"github.com/kaiachain/kaia/rlp"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestBackend_HandleMsg(t *testing.T) {

consensus/istanbul/backend/snapshot.go

@@ -27,10 +27,9 @@ import (
 	"encoding/json"
 	"math/big"
 
-	"github.com/kaiachain/kaia/consensus"
-
 	"github.com/kaiachain/kaia/blockchain/types"
 	"github.com/kaiachain/kaia/common"
+	"github.com/kaiachain/kaia/consensus"
 	"github.com/kaiachain/kaia/consensus/istanbul"
 	"github.com/kaiachain/kaia/consensus/istanbul/validator"
 	"github.com/kaiachain/kaia/governance"

consensus/istanbul/validator.go

@@ -25,9 +25,8 @@ package istanbul
 import (
 	"strings"
 
-	"github.com/kaiachain/kaia/params"
-
 	"github.com/kaiachain/kaia/common"
+	"github.com/kaiachain/kaia/params"
 )
 
 type Validator interface {

console/jsre/pretty.go

@@ -31,7 +31,6 @@ import (
 	"strings"
 
 	"github.com/dop251/goja"
-
 	"github.com/fatih/color"
 )
 

datasync/chaindatafetcher/kafka/consumer_test.go

@@ -27,11 +27,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/mock/gomock"
-	"github.com/kaiachain/kaia/datasync/chaindatafetcher/kafka/mocks"
-
 	"github.com/Shopify/sarama"
+	"github.com/golang/mock/gomock"
 	"github.com/kaiachain/kaia/common"
+	"github.com/kaiachain/kaia/datasync/chaindatafetcher/kafka/mocks"
 	"github.com/stretchr/testify/assert"
 )
 

datasync/chaindatafetcher/kafka/kafka_test.go

@@ -32,10 +32,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
-
 	"github.com/Shopify/sarama"
 	"github.com/kaiachain/kaia/common"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )
 

datasync/chaindatafetcher/kas/contract_caller.go

@@ -24,12 +24,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/kaiachain/kaia/blockchain"
-	"github.com/kaiachain/kaia/blockchain/vm"
-
 	kaia "github.com/kaiachain/kaia"
 	"github.com/kaiachain/kaia/accounts/abi/bind"
 	"github.com/kaiachain/kaia/api"
+	"github.com/kaiachain/kaia/blockchain"
+	"github.com/kaiachain/kaia/blockchain/vm"
 	"github.com/kaiachain/kaia/common"
 	"github.com/kaiachain/kaia/common/hexutil"
 	"github.com/kaiachain/kaia/contracts/contracts/libs/kip13"

datasync/chaindatafetcher/kas/repository_test.go

@@ -27,8 +27,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
-
 	"github.com/jinzhu/gorm"
 	"github.com/kaiachain/kaia/blockchain"
 	"github.com/kaiachain/kaia/blockchain/types"
@@ -40,6 +38,7 @@ import (
 	"github.com/kaiachain/kaia/params"
 	"github.com/kaiachain/kaia/rlp"
 	"github.com/kaiachain/kaia/storage/database"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )
 

datasync/chaindatafetcher/kas/repository_traces_test.go

@@ -21,11 +21,9 @@ package kas
 import (
 	"testing"
 
-	"github.com/kaiachain/kaia/common"
-
 	"github.com/kaiachain/kaia/blockchain/types"
-
 	"github.com/kaiachain/kaia/blockchain/vm"
+	"github.com/kaiachain/kaia/common"
 	"github.com/stretchr/testify/assert"
 )
 

governance/default_test.go

@@ -25,8 +25,6 @@ import (
 	"reflect"
 	"testing"
 
-	gotest_assert "gotest.tools/assert"
-
 	"github.com/kaiachain/kaia/blockchain"
 	"github.com/kaiachain/kaia/blockchain/types"
 	"github.com/kaiachain/kaia/common"
@@ -36,6 +34,7 @@ import (
 	"github.com/kaiachain/kaia/rlp"
 	"github.com/kaiachain/kaia/storage/database"
 	"github.com/stretchr/testify/assert"
+	gotest_assert "gotest.tools/assert"
 )
 
 type voteValue struct {

metrics/prometheus/prometheusmetrics.go

@@ -13,7 +13,6 @@ import (
 	"time"
 
 	kaiametrics "github.com/kaiachain/kaia/metrics"
-
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/rcrowley/go-metrics"
 )

networks/p2p/metrics.go

@@ -28,7 +28,6 @@ import (
 	"net"
 
 	metricutils "github.com/kaiachain/kaia/metrics/utils"
-
 	"github.com/rcrowley/go-metrics"
 )
 

node/cn/config.go

@@ -28,8 +28,6 @@ import (
 	"os/user"
 	"time"
 
-	"github.com/kaiachain/kaia/storage/statedb"
-
 	"github.com/kaiachain/kaia/blockchain"
 	"github.com/kaiachain/kaia/blockchain/vm"
 	"github.com/kaiachain/kaia/common"
@@ -40,6 +38,7 @@ import (
 	"github.com/kaiachain/kaia/node/cn/gasprice"
 	"github.com/kaiachain/kaia/params"
 	"github.com/kaiachain/kaia/storage/database"
+	"github.com/kaiachain/kaia/storage/statedb"
 )
 
 var logger = log.NewModuleLogger(log.NodeCN)

node/cn/filters/api.go

@@ -31,14 +31,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/kaiachain/kaia/params"
-
 	kaia "github.com/kaiachain/kaia"
 	"github.com/kaiachain/kaia/blockchain/types"
 	"github.com/kaiachain/kaia/common"
 	"github.com/kaiachain/kaia/common/hexutil"
 	"github.com/kaiachain/kaia/event"
 	"github.com/kaiachain/kaia/networks/rpc"
+	"github.com/kaiachain/kaia/params"
 	"github.com/kaiachain/kaia/storage/database"
 )
 

node/cn/filters/filter.go

@@ -29,14 +29,13 @@ import (
 	"math/big"
 	"strconv"
 
-	"github.com/kaiachain/kaia/params"
-
 	"github.com/kaiachain/kaia/blockchain"
 	"github.com/kaiachain/kaia/blockchain/bloombits"
 	"github.com/kaiachain/kaia/blockchain/types"
 	"github.com/kaiachain/kaia/common"
 	"github.com/kaiachain/kaia/event"
 	"github.com/kaiachain/kaia/networks/rpc"
+	"github.com/kaiachain/kaia/params"
 	"github.com/kaiachain/kaia/storage/database"
 )