format

neutron-org · Nov 27, 2023 · 20d3739 · 20d3739
1 parent 529134b
commit 20d3739
Show file tree

Hide file tree

Showing 194 changed files with 405 additions and 201 deletions.
diff --git a/Makefile b/Makefile
@@ -185,6 +185,8 @@ format:
 	@go install github.com/golangci/golangci-lint/cmd/[email protected]
 	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -path "./tests/mocks/*" -not -name "*.pb.go" -not -name "*.pb.gw.go" -not -name "*.pulsar.go" -not -path "./crypto/keys/secp256k1/*" | xargs gofumpt -w -l
 	golangci-lint run --fix
+	goimports -w -local github.com/neutron-org .
+
 .PHONY: format
 
 ###############################################################################

diff --git a/app/genesis.go b/app/genesis.go
@@ -8,6 +8,7 @@ import (
 	globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types"
 	ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
 	ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+
 	"github.com/neutron-org/neutron/app/params"
 )
 

diff --git a/app/upgrades/v3/upgrades.go b/app/upgrades/v3/upgrades.go
@@ -5,6 +5,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+
 	"github.com/neutron-org/neutron/app/upgrades"
 
 	crontypes "github.com/neutron-org/neutron/x/cron/types"

diff --git a/tests/ibc/swap_test.go b/tests/ibc/swap_test.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 
 	"cosmossdk.io/math"
+
 	dextypes "github.com/neutron-org/neutron/x/dex/types"
 	swaptypes "github.com/neutron-org/neutron/x/ibcswap/types"
 )

diff --git a/testutil/apptesting/test_suite.go b/testutil/apptesting/test_suite.go
@@ -14,10 +14,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/store/rootmulti"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/stretchr/testify/suite"
+
 	"github.com/neutron-org/neutron/app"
 	"github.com/neutron-org/neutron/testutil"
 	dexmoduletypes "github.com/neutron-org/neutron/x/dex/types"
-	"github.com/stretchr/testify/suite"
 )
 
 type KeeperTestHelper struct {

diff --git a/testutil/cron/keeper/cron.go b/testutil/cron/keeper/cron.go
@@ -14,9 +14,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/store"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/stretchr/testify/require"
+
 	"github.com/neutron-org/neutron/x/cron/keeper"
 	"github.com/neutron-org/neutron/x/cron/types"
-	"github.com/stretchr/testify/require"
 )
 
 func CronKeeper(t testing.TB, wasmMsgServer types.WasmMsgServer, accountKeeper types.AccountKeeper) (*keeper.Keeper, sdk.Context) {

diff --git a/testutil/dex/keeper/dex.go b/testutil/dex/keeper/dex.go
@@ -13,9 +13,10 @@ import (
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	"github.com/stretchr/testify/require"
+
 	"github.com/neutron-org/neutron/x/dex/keeper"
 	"github.com/neutron-org/neutron/x/dex/types"
-	"github.com/stretchr/testify/require"
 )
 
 func DexKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {

diff --git a/testutil/feeburner/keeper/feeburner.go b/testutil/feeburner/keeper/feeburner.go
@@ -14,9 +14,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/store"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/stretchr/testify/require"
+
 	"github.com/neutron-org/neutron/x/feeburner/keeper"
 	"github.com/neutron-org/neutron/x/feeburner/types"
-	"github.com/stretchr/testify/require"
 )
 
 func FeeburnerKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {

diff --git a/testutil/interchaintxs/keeper/sudo_middleware.go b/testutil/interchaintxs/keeper/sudo_middleware.go
@@ -9,9 +9,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/store"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/stretchr/testify/require"
+
 	"github.com/neutron-org/neutron/x/contractmanager"
 	"github.com/neutron-org/neutron/x/contractmanager/types"
-	"github.com/stretchr/testify/require"
 )
 
 func NewSudoLimitWrapper(t testing.TB, cmKeeper types.ContractManagerKeeper, wasmKeeper types.WasmKeeper) (types.WasmKeeper, sdk.Context, *storetypes.KVStoreKey) {

diff --git a/testutil/mocks/contractmanager/types/expected_keepers.go b/testutil/mocks/contractmanager/types/expected_keepers.go
diff --git a/testutil/mocks/interchainqueries/keeper/verify.go b/testutil/mocks/interchainqueries/keeper/verify.go
diff --git a/testutil/mocks/interchaintxs/types/expected_keepers.go b/testutil/mocks/interchaintxs/types/expected_keepers.go
diff --git a/testutil/mocks/transfer/types/expected_keepers.go b/testutil/mocks/transfer/types/expected_keepers.go
diff --git a/utils/bank.go b/utils/bank.go
@@ -5,6 +5,7 @@ import (
 	"sort"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/neutron-org/neutron/x/dex/types"
 
 	"github.com/cosmos/cosmos-sdk/types/query"

diff --git a/utils/dcli/parsers_test.go b/utils/dcli/parsers_test.go
@@ -7,8 +7,9 @@ import (
 
 	"cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	. "github.com/neutron-org/neutron/utils/dcli"
 	"github.com/stretchr/testify/require"
+
+	. "github.com/neutron-org/neutron/utils/dcli"
 )
 
 type testingStruct struct {

diff --git a/wasmbinding/bindings/query.go b/wasmbinding/bindings/query.go
@@ -11,6 +11,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/query"
 
 	ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
+
 	"github.com/neutron-org/neutron/x/interchainqueries/types"
 )
 

diff --git a/wasmbinding/custom_querier.go b/wasmbinding/custom_querier.go
@@ -7,6 +7,7 @@ import (
 
 	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/neutron-org/neutron/wasmbinding/bindings"
 )
 

diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go
@@ -27,6 +27,7 @@ import (
 
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
+
 	"github.com/neutron-org/neutron/wasmbinding/bindings"
 	icqkeeper "github.com/neutron-org/neutron/x/interchainqueries/keeper"
 	icqtypes "github.com/neutron-org/neutron/x/interchainqueries/types"

diff --git a/wasmbinding/queries.go b/wasmbinding/queries.go
@@ -4,6 +4,7 @@ import (
 	"cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkquery "github.com/cosmos/cosmos-sdk/types/query"
+
 	contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types"
 
 	"github.com/neutron-org/neutron/wasmbinding/bindings"

diff --git a/wasmbinding/wasm.go b/wasmbinding/wasm.go
@@ -3,6 +3,7 @@ package wasmbinding
 import (
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
+
 	contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper"
 	cronkeeper "github.com/neutron-org/neutron/x/cron/keeper"
 	feeburnerkeeper "github.com/neutron-org/neutron/x/feeburner/keeper"

diff --git a/x/contractmanager/client/cli/query_failure.go b/x/contractmanager/client/cli/query_failure.go
@@ -9,8 +9,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/version"
 	"github.com/cosmos/cosmos-sdk/x/auth/tx"
-	contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types"
 	"github.com/spf13/cobra"
+
+	contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types"
 )
 
 func CmdFailures() *cobra.Command {

diff --git a/x/contractmanager/ibc_middleware.go b/x/contractmanager/ibc_middleware.go
@@ -6,6 +6,7 @@ import (
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/cometbft/cometbft/libs/log"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper"
 	contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types"
 )

diff --git a/x/contractmanager/ibc_middleware_test.go b/x/contractmanager/ibc_middleware_test.go
@@ -6,11 +6,12 @@ import (
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/require"
+
 	test_keeper "github.com/neutron-org/neutron/testutil/interchaintxs/keeper"
 	mock_types "github.com/neutron-org/neutron/testutil/mocks/contractmanager/types"
 	contractmanagerkeeper "github.com/neutron-org/neutron/x/contractmanager/keeper"
 	"github.com/neutron-org/neutron/x/contractmanager/types"
-	"github.com/stretchr/testify/require"
 )
 
 var (

diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go
@@ -8,6 +8,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
 	"github.com/neutron-org/neutron/x/contractmanager/types"
 )
 

diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go
@@ -8,10 +8,12 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
+
 	"github.com/neutron-org/neutron/testutil"
 	mock_types "github.com/neutron-org/neutron/testutil/mocks/contractmanager/types"
 
 	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+
 	"github.com/neutron-org/neutron/testutil/contractmanager/nullify"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"

diff --git a/x/contractmanager/keeper/grpc_query_failure.go b/x/contractmanager/keeper/grpc_query_failure.go
@@ -6,9 +6,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/query"
-	"github.com/neutron-org/neutron/x/contractmanager/types"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+
+	"github.com/neutron-org/neutron/x/contractmanager/types"
 )
 
 const FailuresQueryMaxLimit uint64 = query.DefaultLimit

diff --git a/x/contractmanager/keeper/keeper.go b/x/contractmanager/keeper/keeper.go
@@ -7,6 +7,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/neutron-org/neutron/x/contractmanager/types"
 )
 

diff --git a/x/contractmanager/keeper/migrations.go b/x/contractmanager/keeper/migrations.go
@@ -2,6 +2,7 @@ package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	v2 "github.com/neutron-org/neutron/x/contractmanager/migrations/v2"
 )
 

diff --git a/x/contractmanager/keeper/msg_server.go b/x/contractmanager/keeper/msg_server.go
@@ -6,6 +6,7 @@ import (
 	"cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
 	"github.com/neutron-org/neutron/x/contractmanager/types"
 )
 

diff --git a/x/contractmanager/migrations/v2/store.go b/x/contractmanager/migrations/v2/store.go
@@ -4,6 +4,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/neutron-org/neutron/x/contractmanager/types"
 )
 

diff --git a/x/contractmanager/migrations/v2/store_test.go b/x/contractmanager/migrations/v2/store_test.go
@@ -4,11 +4,12 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/stretchr/testify/suite"
+
 	"github.com/neutron-org/neutron/testutil"
 	v2 "github.com/neutron-org/neutron/x/contractmanager/migrations/v2"
 	"github.com/neutron-org/neutron/x/contractmanager/types"
 	typesv1 "github.com/neutron-org/neutron/x/contractmanager/types/v1"
-	"github.com/stretchr/testify/suite"
 )
 
 type V2ContractManagerMigrationTestSuite struct {

diff --git a/x/contractmanager/types/failure.pb.go b/x/contractmanager/types/failure.pb.go
diff --git a/x/contractmanager/types/genesis.pb.go b/x/contractmanager/types/genesis.pb.go
diff --git a/x/contractmanager/types/params.pb.go b/x/contractmanager/types/params.pb.go
diff --git a/x/contractmanager/types/query.pb.go b/x/contractmanager/types/query.pb.go
diff --git a/x/contractmanager/types/tx.pb.go b/x/contractmanager/types/tx.pb.go
diff --git a/x/contractmanager/types/v1/failure.pb.go b/x/contractmanager/types/v1/failure.pb.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ import ( @@
     	"sort"
     	sdk "github.com/cosmos/cosmos-sdk/types"
     	"github.com/neutron-org/neutron/x/dex/types"
     	"github.com/cosmos/cosmos-sdk/types/query"
@@ Expand Down @@