diff --git a/.golangci.yml b/.golangci.yml index e95ad678a6..ad90940643 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -32,3 +32,5 @@ linters-settings: rules: - name: package-comments disabled: true + goimports: + local-prefixes: github.com/celestiaorg diff --git a/config/config.go b/config/config.go index 63d744142a..16f5530bd4 100644 --- a/config/config.go +++ b/config/config.go @@ -4,9 +4,10 @@ import ( "encoding/hex" "time" - "github.com/celestiaorg/rollmint/types" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/celestiaorg/rollmint/types" ) const ( diff --git a/config/config_test.go b/config/config_test.go index 5c46cc104b..357368db78 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -4,10 +4,11 @@ import ( "testing" "time" - "github.com/celestiaorg/rollmint/types" "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/stretchr/testify/assert" + + "github.com/celestiaorg/rollmint/types" ) func TestViperAndCobra(t *testing.T) { diff --git a/conv/config_test.go b/conv/config_test.go index 3113aee4b4..3c0d958cea 100644 --- a/conv/config_test.go +++ b/conv/config_test.go @@ -5,8 +5,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/celestiaorg/rollmint/config" tmcfg "github.com/tendermint/tendermint/config" + + "github.com/celestiaorg/rollmint/config" ) func TestGetNodeConfig(t *testing.T) { diff --git a/da/grpc/mockserv/cmd/main.go b/da/grpc/mockserv/cmd/main.go index 4ff70642c7..ee16c67b26 100644 --- a/da/grpc/mockserv/cmd/main.go +++ b/da/grpc/mockserv/cmd/main.go @@ -7,10 +7,11 @@ import ( "os" "strconv" + tmlog "github.com/tendermint/tendermint/libs/log" + grpcda "github.com/celestiaorg/rollmint/da/grpc" "github.com/celestiaorg/rollmint/da/grpc/mockserv" "github.com/celestiaorg/rollmint/store" - tmlog "github.com/tendermint/tendermint/libs/log" ) func main() { diff --git a/da/test/da_test.go b/da/test/da_test.go index d4e1b16311..cb56323d04 100644 --- a/da/test/da_test.go +++ b/da/test/da_test.go @@ -13,6 +13,8 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" + tmlog "github.com/tendermint/tendermint/libs/log" + "github.com/celestiaorg/rollmint/da" "github.com/celestiaorg/rollmint/da/celestia" cmock "github.com/celestiaorg/rollmint/da/celestia/mock" @@ -23,7 +25,6 @@ import ( "github.com/celestiaorg/rollmint/log/test" "github.com/celestiaorg/rollmint/store" "github.com/celestiaorg/rollmint/types" - tmlog "github.com/tendermint/tendermint/libs/log" ) const mockDaBlockTime = 100 * time.Millisecond diff --git a/rpc/json/handler.go b/rpc/json/handler.go index 5143ae31b9..6dcc2b8037 100644 --- a/rpc/json/handler.go +++ b/rpc/json/handler.go @@ -12,9 +12,10 @@ import ( tmjson "github.com/tendermint/tendermint/libs/json" - "github.com/celestiaorg/rollmint/log" "github.com/gorilla/rpc/v2" "github.com/gorilla/rpc/v2/json2" + + "github.com/celestiaorg/rollmint/log" ) type handler struct { diff --git a/store/store_test.go b/store/store_test.go index 5e3f8b13e2..9c66e17b2b 100644 --- a/store/store_test.go +++ b/store/store_test.go @@ -10,9 +10,10 @@ import ( tmstate "github.com/tendermint/tendermint/proto/tendermint/state" tmtypes "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/rollmint/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/celestiaorg/rollmint/types" ) func TestStoreHeight(t *testing.T) {