chore(goimport): fix goimport order (#740)

mask-pp · davidtaikocha · commit 8fefdebdb0e7 · 2024-04-21T23:31:10.000+08:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -60,6 +60,8 @@ linters-settings:
   goconst:
     min-len: 3
     min-occurrences: 6
+  goimports:
+    local-prefixes: github.com/taikoxyz/taiko-client
 
 severity:
   # Set the default severity for issues.
diff --git a/Makefile b/Makefile
@@ -13,7 +13,9 @@ clean:
 	@rm -rf bin/*
 
 lint:
-	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.2 \
+	@go install golang.org/x/tools/cmd/goimports@latest \
+	&& go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.2 \
+	&& goimports -local "github.com/taikoxyz/taiko-client" -w ./ \
 	&& golangci-lint run
 
 test:
diff --git a/cmd/logger/logger.go b/cmd/logger/logger.go
@@ -4,8 +4,9 @@ import (
 	"os"
 
 	"github.com/ethereum/go-ethereum/log"
-	"github.com/taikoxyz/taiko-client/cmd/flags"
 	"github.com/urfave/cli/v2"
+
+	"github.com/taikoxyz/taiko-client/cmd/flags"
 )
 
 // InitLogger initializes the root logger with the command line flags.
diff --git a/driver/chain_syncer/blob/syncer.go b/driver/chain_syncer/blob/syncer.go
@@ -16,6 +16,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/rlp"
+
 	"github.com/taikoxyz/taiko-client/bindings"
 	"github.com/taikoxyz/taiko-client/bindings/encoding"
 	"github.com/taikoxyz/taiko-client/driver/chain_syncer/beaconsync"
diff --git a/driver/driver.go b/driver/driver.go
@@ -13,11 +13,11 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/urfave/cli/v2"
 
 	chainSyncer "github.com/taikoxyz/taiko-client/driver/chain_syncer"
 	"github.com/taikoxyz/taiko-client/driver/state"
 	"github.com/taikoxyz/taiko-client/pkg/rpc"
-	"github.com/urfave/cli/v2"
 )
 
 const (
diff --git a/driver/txlist_fetcher/calldata.go b/driver/txlist_fetcher/calldata.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/ethereum/go-ethereum/core/types"
+
 	"github.com/taikoxyz/taiko-client/bindings"
 	"github.com/taikoxyz/taiko-client/bindings/encoding"
 	"github.com/taikoxyz/taiko-client/pkg"
diff --git a/driver/txlist_fetcher/interface.go b/driver/txlist_fetcher/interface.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/ethereum/go-ethereum/core/types"
+
 	"github.com/taikoxyz/taiko-client/bindings"
 )
 
diff --git a/internal/utils/util_test.go b/internal/utils/util_test.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/stretchr/testify/require"
+
 	"github.com/taikoxyz/taiko-client/internal/testutils"
 	"github.com/taikoxyz/taiko-client/internal/utils"
 )
diff --git a/pkg/flags/config.go b/pkg/flags/config.go
@@ -6,8 +6,9 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/txmgr"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/taikoxyz/taiko-client/cmd/flags"
 	"github.com/urfave/cli/v2"
+
+	"github.com/taikoxyz/taiko-client/cmd/flags"
 )
 
 // InitTxmgrConfigsFromCli initializes the transaction manager configs from the command line flags.
diff --git a/pkg/rpc/blob_datasource.go b/pkg/rpc/blob_datasource.go
@@ -9,6 +9,7 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/go-resty/resty/v2"
 	"github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/blob"
+
 	"github.com/taikoxyz/taiko-client/bindings"
 	"github.com/taikoxyz/taiko-client/pkg"
 )
diff --git a/pkg/rpc/client.go b/pkg/rpc/client.go
@@ -8,6 +8,7 @@ import (
 	"github.com/cenkalti/backoff/v4"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
+
 	"github.com/taikoxyz/taiko-client/bindings"
 )
 
diff --git a/pkg/rpc/methods_test.go b/pkg/rpc/methods_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/stretchr/testify/require"
+
 	"github.com/taikoxyz/taiko-client/bindings/encoding"
 )
 
diff --git a/pkg/rpc/subscription_test.go b/pkg/rpc/subscription_test.go
@@ -7,6 +7,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/stretchr/testify/require"
+
 	"github.com/taikoxyz/taiko-client/bindings"
 )
 
diff --git a/proposer/proposer.go b/proposer/proposer.go
@@ -17,14 +17,15 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/rlp"
 
+	"github.com/urfave/cli/v2"
+
 	"github.com/taikoxyz/taiko-client/bindings"
 	"github.com/taikoxyz/taiko-client/bindings/encoding"
 	"github.com/taikoxyz/taiko-client/internal/metrics"
 	"github.com/taikoxyz/taiko-client/internal/utils"
 	"github.com/taikoxyz/taiko-client/pkg/rpc"
 	selector "github.com/taikoxyz/taiko-client/proposer/prover_selector"
 	builder "github.com/taikoxyz/taiko-client/proposer/transaction_builder"
-	"github.com/urfave/cli/v2"
 )
 
 var (
diff --git a/proposer/transaction_builder/blob.go b/proposer/transaction_builder/blob.go
@@ -11,6 +11,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/crypto/kzg4844"
+
 	"github.com/taikoxyz/taiko-client/bindings/encoding"
 	"github.com/taikoxyz/taiko-client/pkg/rpc"
 	selector "github.com/taikoxyz/taiko-client/proposer/prover_selector"
diff --git a/proposer/transaction_builder/calldata_test.go b/proposer/transaction_builder/calldata_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/taikoxyz/taiko-client/bindings/encoding"
 )
 
diff --git a/proposer/transaction_builder/common.go b/proposer/transaction_builder/common.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/taikoxyz/taiko-client/pkg/rpc"
 )
 
diff --git a/proposer/transaction_builder/interface.go b/proposer/transaction_builder/interface.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/ethereum-optimism/optimism/op-service/txmgr"
+
 	"github.com/taikoxyz/taiko-client/bindings/encoding"
 )
 
diff --git a/prover/event_handler/assignment_expired.go b/prover/event_handler/assignment_expired.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
+
 	"github.com/taikoxyz/taiko-client/bindings"
 	"github.com/taikoxyz/taiko-client/pkg/rpc"
 	proofProducer "github.com/taikoxyz/taiko-client/prover/proof_producer"
diff --git a/prover/event_handler/block_proposed_test.go b/prover/event_handler/block_proposed_test.go
@@ -8,6 +8,7 @@ import (
 	state "github.com/taikoxyz/taiko-client/prover/shared_state"
 
 	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/taikoxyz/taiko-client/bindings"
 )
 
diff --git a/prover/event_handler/block_verified.go b/prover/event_handler/block_verified.go
@@ -3,6 +3,7 @@ package handler
 import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
+
 	"github.com/taikoxyz/taiko-client/bindings"
 	"github.com/taikoxyz/taiko-client/internal/metrics"
 )
diff --git a/prover/event_handler/block_verified_test.go b/prover/event_handler/block_verified_test.go
@@ -2,6 +2,7 @@ package handler
 
 import (
 	"github.com/ethereum/go-ethereum/core/types"
+
 	"github.com/taikoxyz/taiko-client/bindings"
 	"github.com/taikoxyz/taiko-client/internal/testutils"
 )
diff --git a/prover/event_handler/transition_contested.go b/prover/event_handler/transition_contested.go
@@ -7,6 +7,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
+
 	"github.com/taikoxyz/taiko-client/bindings"
 	"github.com/taikoxyz/taiko-client/pkg/rpc"
 	proofProducer "github.com/taikoxyz/taiko-client/prover/proof_producer"
diff --git a/prover/event_handler/transition_proved.go b/prover/event_handler/transition_proved.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
+
 	"github.com/taikoxyz/taiko-client/bindings"
 	"github.com/taikoxyz/taiko-client/internal/metrics"
 	"github.com/taikoxyz/taiko-client/pkg/rpc"
diff --git a/prover/event_handler/util_test.go b/prover/event_handler/util_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/suite"
+
 	"github.com/taikoxyz/taiko-client/bindings"
 	"github.com/taikoxyz/taiko-client/bindings/encoding"
 	"github.com/taikoxyz/taiko-client/internal/testutils"
diff --git a/prover/init_test.go b/prover/init_test.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-service/txmgr"
 	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/taikoxyz/taiko-client/bindings/encoding"
 )
 
diff --git a/prover/server/server_test.go b/prover/server/server_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/go-resty/resty/v2"
 	"github.com/phayes/freeport"
 	"github.com/stretchr/testify/suite"
+
 	"github.com/taikoxyz/taiko-client/pkg/rpc"
 	proofProducer "github.com/taikoxyz/taiko-client/prover/proof_producer"
 )
diff --git a/prover/shared_state/state.go b/prover/shared_state/state.go
@@ -4,6 +4,7 @@ import (
 	"sync/atomic"
 
 	"github.com/ethereum/go-ethereum/core/types"
+
 	"github.com/taikoxyz/taiko-client/pkg/rpc"
 )
 
diff --git a/prover/shared_state/state_test.go b/prover/shared_state/state_test.go
@@ -6,6 +6,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/stretchr/testify/suite"
+
 	"github.com/taikoxyz/taiko-client/pkg/rpc"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,9 @@ import (`
`4`	`4`	`"os"`
`5`	`5`
`6`	`6`	`"github.com/ethereum/go-ethereum/log"`
`7`		`- "github.com/taikoxyz/taiko-client/cmd/flags"`
`8`	`7`	`"github.com/urfave/cli/v2"`
	`8`	`+`
	`9`	`+ "github.com/taikoxyz/taiko-client/cmd/flags"`
`9`	`10`	`)`
`10`	`11`
`11`	`12`	`// InitLogger initializes the root logger with the command line flags.`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`
`6`	`6`	`"github.com/ethereum/go-ethereum/core/types"`
	`7`	`+`
`7`	`8`	`"github.com/taikoxyz/taiko-client/bindings"`
`8`	`9`	`)`
`9`	`10`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/ethereum/go-ethereum/params"`
`8`	`8`	`"github.com/stretchr/testify/require"`
	`9`	`+`
`9`	`10`	`"github.com/taikoxyz/taiko-client/internal/testutils"`
`10`	`11`	`"github.com/taikoxyz/taiko-client/internal/utils"`
`11`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import (`
`9`	`9`	`"github.com/ethereum/go-ethereum/log"`
`10`	`10`	`"github.com/go-resty/resty/v2"`
`11`	`11`	`"github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/blob"`
	`12`	`+`
`12`	`13`	`"github.com/taikoxyz/taiko-client/bindings"`
`13`	`14`	`"github.com/taikoxyz/taiko-client/pkg"`
`14`	`15`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`"github.com/cenkalti/backoff/v4"`
`9`	`9`	`"github.com/ethereum/go-ethereum/common"`
`10`	`10`	`"github.com/ethereum/go-ethereum/log"`
	`11`	`+`
`11`	`12`	`"github.com/taikoxyz/taiko-client/bindings"`
`12`	`13`	`)`
`13`	`14`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"github.com/ethereum/go-ethereum/core/types"`
`8`	`8`	`"github.com/ethereum/go-ethereum/event"`
`9`	`9`	`"github.com/stretchr/testify/require"`
	`10`	`+`
`10`	`11`	`"github.com/taikoxyz/taiko-client/bindings"`
`11`	`12`	`)`
`12`	`13`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/ethereum/go-ethereum/accounts/abi/bind"`
`8`	`8`	`"github.com/ethereum/go-ethereum/common"`
	`9`	`+`
`9`	`10`	`"github.com/taikoxyz/taiko-client/pkg/rpc"`
`10`	`11`	`)`
`11`	`12`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`
`6`	`6`	`"github.com/ethereum-optimism/optimism/op-service/txmgr"`
	`7`	`+`
`7`	`8`	`"github.com/taikoxyz/taiko-client/bindings/encoding"`
`8`	`9`	`)`
`9`	`10`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`state "github.com/taikoxyz/taiko-client/prover/shared_state"`
`9`	`9`
`10`	`10`	`"github.com/ethereum/go-ethereum/common"`
	`11`	`+`
`11`	`12`	`"github.com/taikoxyz/taiko-client/bindings"`
`12`	`13`	`)`
`13`	`14`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package handler`
`3`	`3`	`import (`
`4`	`4`	`"github.com/ethereum/go-ethereum/common"`
`5`	`5`	`"github.com/ethereum/go-ethereum/log"`
	`6`	`+`
`6`	`7`	`"github.com/taikoxyz/taiko-client/bindings"`
`7`	`8`	`"github.com/taikoxyz/taiko-client/internal/metrics"`
`8`	`9`	`)`