Skip to content
This repository has been archived by the owner on May 11, 2024. It is now read-only.

feat(goimport): fix goimport order #740

Merged
merged 3 commits into from
Apr 21, 2024
Merged

feat(goimport): fix goimport order #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f902e2
fix goimport order
mask-pp Apr 21, 2024
a0082c0
fix goimport order
mask-pp Apr 21, 2024
0d4c16a
fix goimport order
mask-pp Apr 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ clean:
@rm -rf bin/*

lint:
@go install github.com/golangci/golangci-lint/cmd/[email protected] \
@go install golang.org/x/tools/cmd/goimports@latest \
&& go install github.com/golangci/golangci-lint/cmd/[email protected] \
&& goimports -local "github.com/taikoxyz/taiko-client" -w ./ \
&& golangci-lint run

test:
Expand Down
3 changes: 2 additions & 1 deletion cmd/logger/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions driver/chain_syncer/blob/syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion driver/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
1 change: 1 addition & 0 deletions driver/txlist_fetcher/calldata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions driver/txlist_fetcher/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"

"github.com/ethereum/go-ethereum/core/types"

"github.com/taikoxyz/taiko-client/bindings"
)

Expand Down
1 change: 1 addition & 0 deletions internal/utils/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
3 changes: 2 additions & 1 deletion pkg/flags/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions pkg/rpc/blob_datasource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
1 change: 1 addition & 0 deletions pkg/rpc/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
1 change: 1 addition & 0 deletions pkg/rpc/methods_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
1 change: 1 addition & 0 deletions pkg/rpc/subscription_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
3 changes: 2 additions & 1 deletion proposer/proposer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
1 change: 1 addition & 0 deletions proposer/transaction_builder/blob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions proposer/transaction_builder/calldata_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"

"github.com/ethereum/go-ethereum/common"

"github.com/taikoxyz/taiko-client/bindings/encoding"
)

Expand Down
1 change: 1 addition & 0 deletions proposer/transaction_builder/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
1 change: 1 addition & 0 deletions proposer/transaction_builder/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"

"github.com/ethereum-optimism/optimism/op-service/txmgr"

"github.com/taikoxyz/taiko-client/bindings/encoding"
)

Expand Down
1 change: 1 addition & 0 deletions prover/event_handler/assignment_expired.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions prover/event_handler/block_proposed_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
1 change: 1 addition & 0 deletions prover/event_handler/block_verified.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
1 change: 1 addition & 0 deletions prover/event_handler/block_verified_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
1 change: 1 addition & 0 deletions prover/event_handler/transition_contested.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions prover/event_handler/transition_proved.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions prover/event_handler/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions prover/init_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
1 change: 1 addition & 0 deletions prover/server/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
1 change: 1 addition & 0 deletions prover/shared_state/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"sync/atomic"

"github.com/ethereum/go-ethereum/core/types"

"github.com/taikoxyz/taiko-client/pkg/rpc"
)

Expand Down
1 change: 1 addition & 0 deletions prover/shared_state/state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
Loading