diff --git a/Makefile b/Makefile index 8ba0ca4d3..d53ec1161 100644 --- a/Makefile +++ b/Makefile @@ -185,6 +185,8 @@ format: @go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.1 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 index c9434396f..8b25acd7d 100644 --- 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 index beabd198e..6be6f3d07 100644 --- 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 index 68ea752de..f4bf576fd 100644 --- 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 index 6a6bf9b46..83e3c3e27 100644 --- 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 index 04987958c..da7cb0644 100644 --- 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 index 275d46a85..1b93fe22f 100644 --- 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 index c5e0c51b9..138390233 100644 --- 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 index 8ab8742e1..160db9d33 100644 --- 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 index 67887c4bc..9c37f0ca0 100644 --- a/testutil/mocks/contractmanager/types/expected_keepers.go +++ b/testutil/mocks/contractmanager/types/expected_keepers.go @@ -10,6 +10,7 @@ import ( types "github.com/CosmWasm/wasmd/x/wasm/types" types0 "github.com/cosmos/cosmos-sdk/types" gomock "github.com/golang/mock/gomock" + types1 "github.com/neutron-org/neutron/x/contractmanager/types" ) diff --git a/testutil/mocks/interchainqueries/keeper/verify.go b/testutil/mocks/interchainqueries/keeper/verify.go index 6e39b57be..f624e2900 100644 --- a/testutil/mocks/interchainqueries/keeper/verify.go +++ b/testutil/mocks/interchainqueries/keeper/verify.go @@ -13,6 +13,7 @@ import ( exported "github.com/cosmos/ibc-go/v7/modules/core/exported" tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" gomock "github.com/golang/mock/gomock" + types1 "github.com/neutron-org/neutron/x/interchainqueries/types" ) diff --git a/testutil/mocks/interchaintxs/types/expected_keepers.go b/testutil/mocks/interchaintxs/types/expected_keepers.go index 32923a9b6..f90216488 100644 --- a/testutil/mocks/interchaintxs/types/expected_keepers.go +++ b/testutil/mocks/interchaintxs/types/expected_keepers.go @@ -15,6 +15,7 @@ import ( types4 "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" exported "github.com/cosmos/ibc-go/v7/modules/core/exported" gomock "github.com/golang/mock/gomock" + types5 "github.com/neutron-org/neutron/x/feerefunder/types" ) diff --git a/testutil/mocks/transfer/types/expected_keepers.go b/testutil/mocks/transfer/types/expected_keepers.go index 3123b6eb5..8fb57a62d 100644 --- a/testutil/mocks/transfer/types/expected_keepers.go +++ b/testutil/mocks/transfer/types/expected_keepers.go @@ -11,6 +11,7 @@ import ( types0 "github.com/cosmos/cosmos-sdk/x/auth/types" types1 "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" gomock "github.com/golang/mock/gomock" + types2 "github.com/neutron-org/neutron/x/feerefunder/types" ) diff --git a/utils/bank.go b/utils/bank.go index e0be3d35a..a7946cea6 100644 --- 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 index 2a90ca363..810b5bf71 100644 --- 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 index 7e0e32f06..f911eee0a 100644 --- 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 index 4709551ac..94d575009 100644 --- 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 index 808015814..8d745a41d 100644 --- 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 index d0cc9ce09..d1f066b86 100644 --- 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 index 19312011f..047cefe3f 100644 --- 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 index 9544e3ebc..f4574316e 100644 --- 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 index 47bb73cdc..ff5f781d3 100644 --- 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 index f56fbd95c..b91aab690 100644 --- 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 index 2be5209f9..b01ac32c9 100644 --- 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 index d0871d3e8..3962eefba 100644 --- 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 index 188829a71..1b62efeb1 100644 --- 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 index 1a431b6c0..ef5205e9f 100644 --- 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 index 3ec98b470..883d4b627 100644 --- 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 index 5b382dd21..26fdaf7bb 100644 --- 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 index 3b43d4be6..d0b64d5f8 100644 --- 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 index 19fddf3ec..40644f633 100644 --- 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 index c06816160..4c8aa4ea1 100644 --- a/x/contractmanager/types/failure.pb.go +++ b/x/contractmanager/types/failure.pb.go @@ -5,11 +5,12 @@ package types import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" - _ "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" io "io" math "math" math_bits "math/bits" + + proto "github.com/cosmos/gogoproto/proto" + _ "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/contractmanager/types/genesis.pb.go b/x/contractmanager/types/genesis.pb.go index a40d4edc0..453b599ff 100644 --- a/x/contractmanager/types/genesis.pb.go +++ b/x/contractmanager/types/genesis.pb.go @@ -5,11 +5,12 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/contractmanager/types/params.pb.go b/x/contractmanager/types/params.pb.go index 39cec5b65..f081c02d9 100644 --- a/x/contractmanager/types/params.pb.go +++ b/x/contractmanager/types/params.pb.go @@ -5,11 +5,12 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/contractmanager/types/query.pb.go b/x/contractmanager/types/query.pb.go index b4d8f4adc..9e7f03cd8 100644 --- a/x/contractmanager/types/query.pb.go +++ b/x/contractmanager/types/query.pb.go @@ -6,6 +6,10 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" @@ -14,9 +18,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/contractmanager/types/tx.pb.go b/x/contractmanager/types/tx.pb.go index c83e95d44..9120f9799 100644 --- a/x/contractmanager/types/tx.pb.go +++ b/x/contractmanager/types/tx.pb.go @@ -6,6 +6,10 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" @@ -15,9 +19,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/contractmanager/types/v1/failure.pb.go b/x/contractmanager/types/v1/failure.pb.go index df2ffd000..90e3cd2e4 100644 --- a/x/contractmanager/types/v1/failure.pb.go +++ b/x/contractmanager/types/v1/failure.pb.go @@ -5,10 +5,11 @@ package v1 import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cron/client/cli/query.go b/x/cron/client/cli/query.go index 9f8e2aba8..14c16d932 100644 --- a/x/cron/client/cli/query.go +++ b/x/cron/client/cli/query.go @@ -6,6 +6,7 @@ import ( "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" + "github.com/neutron-org/neutron/x/cron/types" ) diff --git a/x/cron/client/cli/query_params.go b/x/cron/client/cli/query_params.go index 346ed3088..05fd55e10 100644 --- a/x/cron/client/cli/query_params.go +++ b/x/cron/client/cli/query_params.go @@ -5,8 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/x/cron/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/cron/types" ) func CmdQueryParams() *cobra.Command { diff --git a/x/cron/client/cli/query_schedule.go b/x/cron/client/cli/query_schedule.go index ae5b3111e..fb81b16be 100644 --- a/x/cron/client/cli/query_schedule.go +++ b/x/cron/client/cli/query_schedule.go @@ -5,8 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/x/cron/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/cron/types" ) func CmdListSchedule() *cobra.Command { diff --git a/x/cron/client/cli/query_schedule_test.go b/x/cron/client/cli/query_schedule_test.go index 37f946848..7d6edec95 100644 --- a/x/cron/client/cli/query_schedule_test.go +++ b/x/cron/client/cli/query_schedule_test.go @@ -8,13 +8,14 @@ import ( tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" + "github.com/stretchr/testify/require" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + "github.com/neutron-org/neutron/testutil/cron/network" "github.com/neutron-org/neutron/testutil/cron/nullify" "github.com/neutron-org/neutron/x/cron/client/cli" "github.com/neutron-org/neutron/x/cron/types" - "github.com/stretchr/testify/require" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" ) // Prevent strconv unused error diff --git a/x/cron/client/cli/tx.go b/x/cron/client/cli/tx.go index c8d7a2986..a14b8b144 100644 --- a/x/cron/client/cli/tx.go +++ b/x/cron/client/cli/tx.go @@ -6,6 +6,7 @@ import ( "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" + "github.com/neutron-org/neutron/x/cron/types" ) diff --git a/x/cron/genesis_test.go b/x/cron/genesis_test.go index 1840df5e0..800906aa4 100644 --- a/x/cron/genesis_test.go +++ b/x/cron/genesis_test.go @@ -3,11 +3,12 @@ package cron_test import ( "testing" + "github.com/stretchr/testify/require" + "github.com/neutron-org/neutron/testutil/cron/keeper" "github.com/neutron-org/neutron/testutil/cron/nullify" "github.com/neutron-org/neutron/x/cron" "github.com/neutron-org/neutron/x/cron/types" - "github.com/stretchr/testify/require" ) func TestGenesis(t *testing.T) { diff --git a/x/cron/keeper/grpc_query_params.go b/x/cron/keeper/grpc_query_params.go index ca3842241..a34a75dff 100644 --- a/x/cron/keeper/grpc_query_params.go +++ b/x/cron/keeper/grpc_query_params.go @@ -4,9 +4,10 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/x/cron/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/neutron-org/neutron/x/cron/types" ) func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { diff --git a/x/cron/keeper/grpc_query_params_test.go b/x/cron/keeper/grpc_query_params_test.go index 27193b7d9..19843d23a 100644 --- a/x/cron/keeper/grpc_query_params_test.go +++ b/x/cron/keeper/grpc_query_params_test.go @@ -6,8 +6,9 @@ import ( testkeeper "github.com/neutron-org/neutron/testutil/cron/keeper" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/x/cron/types" "github.com/stretchr/testify/require" + + "github.com/neutron-org/neutron/x/cron/types" ) func TestParamsQuery(t *testing.T) { diff --git a/x/cron/keeper/grpc_query_schedule.go b/x/cron/keeper/grpc_query_schedule.go index 9ad8e6ef9..a48fc80c7 100644 --- a/x/cron/keeper/grpc_query_schedule.go +++ b/x/cron/keeper/grpc_query_schedule.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/cron/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/neutron-org/neutron/x/cron/types" ) func (k Keeper) Schedules(c context.Context, req *types.QuerySchedulesRequest) (*types.QuerySchedulesResponse, error) { diff --git a/x/cron/keeper/grpc_query_schedule_test.go b/x/cron/keeper/grpc_query_schedule_test.go index fbaa08701..7d7c26fea 100644 --- a/x/cron/keeper/grpc_query_schedule_test.go +++ b/x/cron/keeper/grpc_query_schedule_test.go @@ -6,13 +6,14 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" + "github.com/stretchr/testify/require" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + testutil_keeper "github.com/neutron-org/neutron/testutil/cron/keeper" "github.com/neutron-org/neutron/testutil/cron/nullify" cronkeeper "github.com/neutron-org/neutron/x/cron/keeper" "github.com/neutron-org/neutron/x/cron/types" - "github.com/stretchr/testify/require" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" ) // Prevent strconv unused error diff --git a/x/cron/keeper/keeper.go b/x/cron/keeper/keeper.go index c5e582005..28db8e5e0 100644 --- a/x/cron/keeper/keeper.go +++ b/x/cron/keeper/keeper.go @@ -16,6 +16,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/cron/types" ) diff --git a/x/cron/keeper/keeper_test.go b/x/cron/keeper/keeper_test.go index 990c556f4..856112079 100644 --- a/x/cron/keeper/keeper_test.go +++ b/x/cron/keeper/keeper_test.go @@ -10,11 +10,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" + "github.com/neutron-org/neutron/testutil" testutil_keeper "github.com/neutron-org/neutron/testutil/cron/keeper" mock_types "github.com/neutron-org/neutron/testutil/mocks/cron/types" "github.com/neutron-org/neutron/x/cron/types" - "github.com/stretchr/testify/require" ) // ExecuteReadySchedules: diff --git a/x/cron/keeper/msg_server.go b/x/cron/keeper/msg_server.go index 6607dd09a..c75bf09ab 100644 --- a/x/cron/keeper/msg_server.go +++ b/x/cron/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/cron/types" ) diff --git a/x/cron/keeper/params.go b/x/cron/keeper/params.go index 870979a43..4aafba2fe 100644 --- a/x/cron/keeper/params.go +++ b/x/cron/keeper/params.go @@ -2,6 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/cron/types" ) diff --git a/x/cron/keeper/params_test.go b/x/cron/keeper/params_test.go index 1f5e02c90..aaf2c1a90 100644 --- a/x/cron/keeper/params_test.go +++ b/x/cron/keeper/params_test.go @@ -9,8 +9,9 @@ import ( testkeeper "github.com/neutron-org/neutron/testutil/cron/keeper" - "github.com/neutron-org/neutron/x/cron/types" "github.com/stretchr/testify/require" + + "github.com/neutron-org/neutron/x/cron/types" ) func TestGetParams(t *testing.T) { diff --git a/x/cron/module.go b/x/cron/module.go index fb8aa0eb9..126de14f0 100644 --- a/x/cron/module.go +++ b/x/cron/module.go @@ -19,6 +19,7 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" + "github.com/neutron-org/neutron/x/cron/client/cli" "github.com/neutron-org/neutron/x/cron/keeper" "github.com/neutron-org/neutron/x/cron/types" diff --git a/x/cron/module_simulation.go b/x/cron/module_simulation.go index 2f2fd4d65..71ae781a3 100644 --- a/x/cron/module_simulation.go +++ b/x/cron/module_simulation.go @@ -7,6 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" + cronsimulation "github.com/neutron-org/neutron/x/cron/simulation" "github.com/neutron-org/neutron/x/cron/types" ) diff --git a/x/cron/types/genesis.pb.go b/x/cron/types/genesis.pb.go index 8d710d18a..57d8640b2 100644 --- a/x/cron/types/genesis.pb.go +++ b/x/cron/types/genesis.pb.go @@ -5,11 +5,12 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cron/types/genesis_test.go b/x/cron/types/genesis_test.go index 5d080e4f8..8a748d687 100644 --- a/x/cron/types/genesis_test.go +++ b/x/cron/types/genesis_test.go @@ -5,8 +5,9 @@ import ( "github.com/neutron-org/neutron/app" - "github.com/neutron-org/neutron/x/cron/types" "github.com/stretchr/testify/require" + + "github.com/neutron-org/neutron/x/cron/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/cron/types/params.pb.go b/x/cron/types/params.pb.go index 128e63f28..79fef4520 100644 --- a/x/cron/types/params.pb.go +++ b/x/cron/types/params.pb.go @@ -5,11 +5,12 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cron/types/query.pb.go b/x/cron/types/query.pb.go index 7998c0d71..70ac3b75b 100644 --- a/x/cron/types/query.pb.go +++ b/x/cron/types/query.pb.go @@ -6,6 +6,10 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" @@ -14,9 +18,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cron/types/schedule.pb.go b/x/cron/types/schedule.pb.go index f0206d02c..9fce68a6e 100644 --- a/x/cron/types/schedule.pb.go +++ b/x/cron/types/schedule.pb.go @@ -5,11 +5,12 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cron/types/tx.pb.go b/x/cron/types/tx.pb.go index df3c178d2..3d7a094cb 100644 --- a/x/cron/types/tx.pb.go +++ b/x/cron/types/tx.pb.go @@ -6,6 +6,10 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" @@ -15,9 +19,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/client/cli/query.go b/x/dex/client/cli/query.go index 1d27bebbe..ae25f7c17 100644 --- a/x/dex/client/cli/query.go +++ b/x/dex/client/cli/query.go @@ -4,8 +4,9 @@ import ( "fmt" "github.com/cosmos/cosmos-sdk/client" - "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/dex/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/dex/client/cli/query_limit_order_tranche_user.go b/x/dex/client/cli/query_limit_order_tranche_user.go index c273e5d50..357f99f4d 100644 --- a/x/dex/client/cli/query_limit_order_tranche_user.go +++ b/x/dex/client/cli/query_limit_order_tranche_user.go @@ -5,8 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/dex/types" ) func CmdListLimitOrderTrancheUser() *cobra.Command { diff --git a/x/dex/client/cli/query_params.go b/x/dex/client/cli/query_params.go index 2deda9bd7..74416197a 100644 --- a/x/dex/client/cli/query_params.go +++ b/x/dex/client/cli/query_params.go @@ -5,8 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/dex/types" ) func CmdQueryParams() *cobra.Command { diff --git a/x/dex/client/cli/query_pool_metadata.go b/x/dex/client/cli/query_pool_metadata.go index 5412f789d..54f51e60d 100644 --- a/x/dex/client/cli/query_pool_metadata.go +++ b/x/dex/client/cli/query_pool_metadata.go @@ -5,8 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/dex/types" ) func CmdListPoolMetadata() *cobra.Command { diff --git a/x/dex/client/cli/query_user_deposits.go b/x/dex/client/cli/query_user_deposits.go index 410e44f63..a6b7d8e66 100644 --- a/x/dex/client/cli/query_user_deposits.go +++ b/x/dex/client/cli/query_user_deposits.go @@ -3,8 +3,9 @@ package cli import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/dex/types" ) func CmdListUserDeposits() *cobra.Command { diff --git a/x/dex/client/cli/query_user_limit_orders.go b/x/dex/client/cli/query_user_limit_orders.go index 2800a6943..0bff8942f 100644 --- a/x/dex/client/cli/query_user_limit_orders.go +++ b/x/dex/client/cli/query_user_limit_orders.go @@ -3,8 +3,9 @@ package cli import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/dex/types" ) func CmdListUserLimitOrders() *cobra.Command { diff --git a/x/dex/client/cli/tx.go b/x/dex/client/cli/tx.go index 7628cad30..362705342 100644 --- a/x/dex/client/cli/tx.go +++ b/x/dex/client/cli/tx.go @@ -7,6 +7,7 @@ import ( "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" + "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/client/cli/tx_cancel_limit_order.go b/x/dex/client/cli/tx_cancel_limit_order.go index 2eb7340f3..341642996 100644 --- a/x/dex/client/cli/tx_cancel_limit_order.go +++ b/x/dex/client/cli/tx_cancel_limit_order.go @@ -4,8 +4,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/dex/types" ) func CmdCancelLimitOrder() *cobra.Command { diff --git a/x/dex/client/cli/tx_deposit.go b/x/dex/client/cli/tx_deposit.go index 55787ce79..8b004391e 100644 --- a/x/dex/client/cli/tx_deposit.go +++ b/x/dex/client/cli/tx_deposit.go @@ -10,8 +10,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/dex/types" ) func CmdDeposit() *cobra.Command { diff --git a/x/dex/client/cli/tx_multi_hop_swap.go b/x/dex/client/cli/tx_multi_hop_swap.go index 0dab65dab..1e819c3cd 100644 --- a/x/dex/client/cli/tx_multi_hop_swap.go +++ b/x/dex/client/cli/tx_multi_hop_swap.go @@ -9,9 +9,10 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" + "github.com/spf13/cobra" + math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" - "github.com/spf13/cobra" ) var _ = strconv.Itoa(0) diff --git a/x/dex/client/cli/tx_place_limit_order.go b/x/dex/client/cli/tx_place_limit_order.go index 13f83d0c5..e293375f5 100644 --- a/x/dex/client/cli/tx_place_limit_order.go +++ b/x/dex/client/cli/tx_place_limit_order.go @@ -10,8 +10,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/dex/types" ) func CmdPlaceLimitOrder() *cobra.Command { diff --git a/x/dex/client/cli/tx_withdrawl.go b/x/dex/client/cli/tx_withdrawl.go index 720b44394..fdc8bd414 100644 --- a/x/dex/client/cli/tx_withdrawl.go +++ b/x/dex/client/cli/tx_withdrawl.go @@ -9,8 +9,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/dex/types" ) func CmdWithdrawal() *cobra.Command { diff --git a/x/dex/client/cli/tx_withdrawl_filled_limit_order.go b/x/dex/client/cli/tx_withdrawl_filled_limit_order.go index 9809c1cd5..4cdf5c52b 100644 --- a/x/dex/client/cli/tx_withdrawl_filled_limit_order.go +++ b/x/dex/client/cli/tx_withdrawl_filled_limit_order.go @@ -4,8 +4,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/neutron-org/neutron/x/dex/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/dex/types" ) func CmdWithdrawFilledLimitOrder() *cobra.Command { diff --git a/x/dex/genesis.go b/x/dex/genesis.go index 8d1fbb5f2..e8d35a309 100644 --- a/x/dex/genesis.go +++ b/x/dex/genesis.go @@ -2,6 +2,7 @@ package dex import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" diff --git a/x/dex/keeper/core_helper.go b/x/dex/keeper/core_helper.go index 637329300..6242338db 100644 --- a/x/dex/keeper/core_helper.go +++ b/x/dex/keeper/core_helper.go @@ -4,9 +4,10 @@ import ( sdkerrors "cosmossdk.io/errors" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "golang.org/x/exp/slices" + math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" - "golang.org/x/exp/slices" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/x/dex/keeper/core_helper_test.go b/x/dex/keeper/core_helper_test.go index 681cc100e..1d1712b0b 100644 --- a/x/dex/keeper/core_helper_test.go +++ b/x/dex/keeper/core_helper_test.go @@ -6,10 +6,11 @@ import ( "cosmossdk.io/math" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/suite" + neutronapp "github.com/neutron-org/neutron/app" "github.com/neutron-org/neutron/testutil" "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/suite" ) // Test Suite /////////////////////////////////////////////////////////////// diff --git a/x/dex/keeper/grpc_query_estimate_multi_hop_swap.go b/x/dex/keeper/grpc_query_estimate_multi_hop_swap.go index a178f5ca4..b0bbc7a3f 100644 --- a/x/dex/keeper/grpc_query_estimate_multi_hop_swap.go +++ b/x/dex/keeper/grpc_query_estimate_multi_hop_swap.go @@ -4,6 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/grpc_query_estimate_multi_hop_swap_test.go b/x/dex/keeper/grpc_query_estimate_multi_hop_swap_test.go index a589a6dee..d5d79d461 100644 --- a/x/dex/keeper/grpc_query_estimate_multi_hop_swap_test.go +++ b/x/dex/keeper/grpc_query_estimate_multi_hop_swap_test.go @@ -3,6 +3,7 @@ package keeper_test import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/grpc_query_estimate_place_limit_order.go b/x/dex/keeper/grpc_query_estimate_place_limit_order.go index d616708ea..c4ce8ae98 100644 --- a/x/dex/keeper/grpc_query_estimate_place_limit_order.go +++ b/x/dex/keeper/grpc_query_estimate_place_limit_order.go @@ -5,6 +5,7 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/grpc_query_limit_order_tranche_user.go b/x/dex/keeper/grpc_query_limit_order_tranche_user.go index 7d89ae772..d32542419 100644 --- a/x/dex/keeper/grpc_query_limit_order_tranche_user.go +++ b/x/dex/keeper/grpc_query_limit_order_tranche_user.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/dex/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/neutron-org/neutron/x/dex/types" ) func (k Keeper) LimitOrderTrancheUserAll( diff --git a/x/dex/keeper/grpc_query_params.go b/x/dex/keeper/grpc_query_params.go index 0ea6f35ab..20b0af47b 100644 --- a/x/dex/keeper/grpc_query_params.go +++ b/x/dex/keeper/grpc_query_params.go @@ -4,9 +4,10 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/x/dex/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/neutron-org/neutron/x/dex/types" ) func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { diff --git a/x/dex/keeper/grpc_query_params_test.go b/x/dex/keeper/grpc_query_params_test.go index 5b44a7a10..4d0d58cd7 100644 --- a/x/dex/keeper/grpc_query_params_test.go +++ b/x/dex/keeper/grpc_query_params_test.go @@ -4,9 +4,10 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/require" + testkeeper "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" ) func TestParamsQuery(t *testing.T) { diff --git a/x/dex/keeper/grpc_query_pool_metadata.go b/x/dex/keeper/grpc_query_pool_metadata.go index 5debb51c2..4cb69eeb4 100644 --- a/x/dex/keeper/grpc_query_pool_metadata.go +++ b/x/dex/keeper/grpc_query_pool_metadata.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/dex/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/neutron-org/neutron/x/dex/types" ) func (k Keeper) PoolMetadataAll(goCtx context.Context, req *types.QueryAllPoolMetadataRequest) (*types.QueryAllPoolMetadataResponse, error) { diff --git a/x/dex/keeper/inactive_limit_order_tranche.go b/x/dex/keeper/inactive_limit_order_tranche.go index 339be79c4..20fb17999 100644 --- a/x/dex/keeper/inactive_limit_order_tranche.go +++ b/x/dex/keeper/inactive_limit_order_tranche.go @@ -3,6 +3,7 @@ package keeper import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/inactive_limit_order_tranche_test.go b/x/dex/keeper/inactive_limit_order_tranche_test.go index 68e0d34ed..c38189e33 100644 --- a/x/dex/keeper/inactive_limit_order_tranche_test.go +++ b/x/dex/keeper/inactive_limit_order_tranche_test.go @@ -6,11 +6,12 @@ import ( math "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/require" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/testutil/dex/nullify" "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" ) func createNInactiveLimitOrderTranche( diff --git a/x/dex/keeper/integration_cancellimitorder_test.go b/x/dex/keeper/integration_cancellimitorder_test.go index 6bfdd305a..f9e723c4f 100644 --- a/x/dex/keeper/integration_cancellimitorder_test.go +++ b/x/dex/keeper/integration_cancellimitorder_test.go @@ -6,6 +6,7 @@ import ( sdkmath "cosmossdk.io/math" abci "github.com/cometbft/cometbft/abci/types" + "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/integration_deposit_doublesided_test.go b/x/dex/keeper/integration_deposit_doublesided_test.go index 35c9e3020..21053cb8a 100644 --- a/x/dex/keeper/integration_deposit_doublesided_test.go +++ b/x/dex/keeper/integration_deposit_doublesided_test.go @@ -2,6 +2,7 @@ package keeper_test import ( "cosmossdk.io/math" + "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/integration_deposit_singlesided_test.go b/x/dex/keeper/integration_deposit_singlesided_test.go index cdf8ca9f9..f3edc24d0 100644 --- a/x/dex/keeper/integration_deposit_singlesided_test.go +++ b/x/dex/keeper/integration_deposit_singlesided_test.go @@ -4,6 +4,7 @@ import ( "math" sdkmath "cosmossdk.io/math" + "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/integration_multihopswap_test.go b/x/dex/keeper/integration_multihopswap_test.go index 4ce918b03..52e3a1f1a 100644 --- a/x/dex/keeper/integration_multihopswap_test.go +++ b/x/dex/keeper/integration_multihopswap_test.go @@ -3,6 +3,7 @@ package keeper_test import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + math_utils "github.com/neutron-org/neutron/utils/math" "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/integration_withdraw_test.go b/x/dex/keeper/integration_withdraw_test.go index 4b2d100b3..c2f4cf9f9 100644 --- a/x/dex/keeper/integration_withdraw_test.go +++ b/x/dex/keeper/integration_withdraw_test.go @@ -4,6 +4,7 @@ import ( "math" sdkmath "cosmossdk.io/math" + "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/internal/testutils/test_helpers.go b/x/dex/keeper/internal/testutils/test_helpers.go index 700489211..b533da713 100644 --- a/x/dex/keeper/internal/testutils/test_helpers.go +++ b/x/dex/keeper/internal/testutils/test_helpers.go @@ -4,6 +4,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + dexmoduletypes "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/keeper.go b/x/dex/keeper/keeper.go index 52f04cf34..903e07d79 100644 --- a/x/dex/keeper/keeper.go +++ b/x/dex/keeper/keeper.go @@ -8,6 +8,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/dex/types" ) diff --git a/x/dex/keeper/limit_order_expiration.go b/x/dex/keeper/limit_order_expiration.go index a06886131..33e1ecc07 100644 --- a/x/dex/keeper/limit_order_expiration.go +++ b/x/dex/keeper/limit_order_expiration.go @@ -5,6 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/limit_order_tranche_test.go b/x/dex/keeper/limit_order_tranche_test.go index 70e22ab44..7183bf8b3 100644 --- a/x/dex/keeper/limit_order_tranche_test.go +++ b/x/dex/keeper/limit_order_tranche_test.go @@ -6,11 +6,12 @@ import ( math "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/require" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/testutil/dex/nullify" "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" ) func createNLimitOrderTranches( diff --git a/x/dex/keeper/liquidity_iterator.go b/x/dex/keeper/liquidity_iterator.go index 64420363c..70dcff66a 100644 --- a/x/dex/keeper/liquidity_iterator.go +++ b/x/dex/keeper/liquidity_iterator.go @@ -2,6 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/msg_server.go b/x/dex/keeper/msg_server.go index 4857aa1c2..922e1388e 100644 --- a/x/dex/keeper/msg_server.go +++ b/x/dex/keeper/msg_server.go @@ -4,9 +4,10 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/x/dex/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/neutron-org/neutron/x/dex/types" ) type MsgServer struct { diff --git a/x/dex/keeper/params.go b/x/dex/keeper/params.go index 9b13ebbae..949795d99 100644 --- a/x/dex/keeper/params.go +++ b/x/dex/keeper/params.go @@ -2,6 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/params_test.go b/x/dex/keeper/params_test.go index 9dadfb7d8..1cca6c8f8 100644 --- a/x/dex/keeper/params_test.go +++ b/x/dex/keeper/params_test.go @@ -3,9 +3,10 @@ package keeper_test import ( "testing" + "github.com/stretchr/testify/require" + testkeeper "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" ) func TestGetParams(t *testing.T) { diff --git a/x/dex/keeper/pool_reserves.go b/x/dex/keeper/pool_reserves.go index 7c9f44c89..0b1b234bd 100644 --- a/x/dex/keeper/pool_reserves.go +++ b/x/dex/keeper/pool_reserves.go @@ -3,6 +3,7 @@ package keeper import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/pool_reserves_test.go b/x/dex/keeper/pool_reserves_test.go index b3dff4c09..cd825b02d 100644 --- a/x/dex/keeper/pool_reserves_test.go +++ b/x/dex/keeper/pool_reserves_test.go @@ -4,11 +4,12 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/require" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/testutil/dex/nullify" "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" ) func createNPoolReserves(k *keeper.Keeper, ctx sdk.Context, n int) []*types.PoolReserves { diff --git a/x/dex/keeper/tick_iterator.go b/x/dex/keeper/tick_iterator.go index b011565dd..ea7a7f74d 100644 --- a/x/dex/keeper/tick_iterator.go +++ b/x/dex/keeper/tick_iterator.go @@ -4,6 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/tick_liquidity.go b/x/dex/keeper/tick_liquidity.go index 44687403c..bd7ebe876 100644 --- a/x/dex/keeper/tick_liquidity.go +++ b/x/dex/keeper/tick_liquidity.go @@ -3,6 +3,7 @@ package keeper import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/keeper/tick_liquidity_test.go b/x/dex/keeper/tick_liquidity_test.go index 2fb663128..662c0b5c1 100644 --- a/x/dex/keeper/tick_liquidity_test.go +++ b/x/dex/keeper/tick_liquidity_test.go @@ -6,10 +6,11 @@ import ( math "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/require" + keepertest "github.com/neutron-org/neutron/testutil/dex/keeper" "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" ) func CreateNTickLiquidity(keeper *keeper.Keeper, ctx sdk.Context, n int) []*types.TickLiquidity { diff --git a/x/dex/module.go b/x/dex/module.go index 85a67a439..a7a68c3a2 100644 --- a/x/dex/module.go +++ b/x/dex/module.go @@ -16,6 +16,7 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" + "github.com/neutron-org/neutron/x/dex/client/cli" "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" diff --git a/x/dex/module_simulation.go b/x/dex/module_simulation.go index c2d1311d7..8327b53b2 100644 --- a/x/dex/module_simulation.go +++ b/x/dex/module_simulation.go @@ -8,6 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" + "github.com/neutron-org/neutron/testutil/common/sample" dexsimulation "github.com/neutron-org/neutron/x/dex/simulation" "github.com/neutron-org/neutron/x/dex/types" diff --git a/x/dex/simulation/cancel_limit_order.go b/x/dex/simulation/cancel_limit_order.go index 6e4081eac..9a2dfdf4a 100644 --- a/x/dex/simulation/cancel_limit_order.go +++ b/x/dex/simulation/cancel_limit_order.go @@ -6,6 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/simulation/deposit.go b/x/dex/simulation/deposit.go index 186aa0a1e..4c24027b5 100644 --- a/x/dex/simulation/deposit.go +++ b/x/dex/simulation/deposit.go @@ -6,6 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/simulation/multi_hop_swap.go b/x/dex/simulation/multi_hop_swap.go index 7e73559e4..7013b9b6d 100644 --- a/x/dex/simulation/multi_hop_swap.go +++ b/x/dex/simulation/multi_hop_swap.go @@ -6,6 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/simulation/place_limit_order.go b/x/dex/simulation/place_limit_order.go index 9f8063124..d1b5a4ed8 100644 --- a/x/dex/simulation/place_limit_order.go +++ b/x/dex/simulation/place_limit_order.go @@ -6,6 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/simulation/withdrawl.go b/x/dex/simulation/withdrawl.go index bf62fe5ec..f51e93dd1 100644 --- a/x/dex/simulation/withdrawl.go +++ b/x/dex/simulation/withdrawl.go @@ -6,6 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/simulation/withdrawl_filled_limit_order.go b/x/dex/simulation/withdrawl_filled_limit_order.go index ed013038e..36508afc3 100644 --- a/x/dex/simulation/withdrawl_filled_limit_order.go +++ b/x/dex/simulation/withdrawl_filled_limit_order.go @@ -6,6 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/neutron-org/neutron/x/dex/keeper" "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/dex/types/deposit_record.pb.go b/x/dex/types/deposit_record.pb.go index 897e3160b..90c72e068 100644 --- a/x/dex/types/deposit_record.pb.go +++ b/x/dex/types/deposit_record.pb.go @@ -5,12 +5,13 @@ package types import ( fmt "fmt" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/genesis.pb.go b/x/dex/types/genesis.pb.go index 60e2fe03d..18e9206e2 100644 --- a/x/dex/types/genesis.pb.go +++ b/x/dex/types/genesis.pb.go @@ -5,11 +5,12 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/keys.go b/x/dex/types/keys.go index ec12ebd3d..d4fc0f9ad 100644 --- a/x/dex/types/keys.go +++ b/x/dex/types/keys.go @@ -5,6 +5,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/dex/utils" ) diff --git a/x/dex/types/limit_order_expiration.pb.go b/x/dex/types/limit_order_expiration.pb.go index 1de9e33a6..d6734e4dc 100644 --- a/x/dex/types/limit_order_expiration.pb.go +++ b/x/dex/types/limit_order_expiration.pb.go @@ -5,14 +5,15 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" math_bits "math/bits" time "time" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + _ "google.golang.org/protobuf/types/known/timestamppb" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/limit_order_tranche.pb.go b/x/dex/types/limit_order_tranche.pb.go index 0362678b6..a0c8c24f7 100644 --- a/x/dex/types/limit_order_tranche.pb.go +++ b/x/dex/types/limit_order_tranche.pb.go @@ -5,16 +5,18 @@ package types import ( fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + time "time" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - github_com_neutron_org_neutron_utils_math "github.com/neutron-org/neutron/utils/math" _ "google.golang.org/protobuf/types/known/timestamppb" - io "io" - math "math" - math_bits "math/bits" - time "time" + + github_com_neutron_org_neutron_utils_math "github.com/neutron-org/neutron/utils/math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/limit_order_tranche_user.pb.go b/x/dex/types/limit_order_tranche_user.pb.go index cedd9aed1..d04f0b231 100644 --- a/x/dex/types/limit_order_tranche_user.pb.go +++ b/x/dex/types/limit_order_tranche_user.pb.go @@ -5,12 +5,13 @@ package types import ( fmt "fmt" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/liquidity.go b/x/dex/types/liquidity.go index d8a4f105f..200e35fa7 100644 --- a/x/dex/types/liquidity.go +++ b/x/dex/types/liquidity.go @@ -2,6 +2,7 @@ package types import ( "cosmossdk.io/math" + math_utils "github.com/neutron-org/neutron/utils/math" ) diff --git a/x/dex/types/message_cancel_limit_order_test.go b/x/dex/types/message_cancel_limit_order_test.go index 421defb08..c3728270d 100644 --- a/x/dex/types/message_cancel_limit_order_test.go +++ b/x/dex/types/message_cancel_limit_order_test.go @@ -3,9 +3,10 @@ package types_test import ( "testing" + "github.com/stretchr/testify/require" + "github.com/neutron-org/neutron/testutil/common/sample" . "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" ) func TestMsgCancelLimitOrder_ValidateBasic(t *testing.T) { diff --git a/x/dex/types/message_multi_hop_swap_test.go b/x/dex/types/message_multi_hop_swap_test.go index 93d6ae9d1..552ca806a 100644 --- a/x/dex/types/message_multi_hop_swap_test.go +++ b/x/dex/types/message_multi_hop_swap_test.go @@ -6,9 +6,10 @@ import ( math_utils "github.com/neutron-org/neutron/utils/math" "cosmossdk.io/math" + "github.com/stretchr/testify/require" + "github.com/neutron-org/neutron/testutil/common/sample" . "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" ) func TestMsgMultiHopSwap_ValidateBasic(t *testing.T) { diff --git a/x/dex/types/message_place_limit_order_test.go b/x/dex/types/message_place_limit_order_test.go index 37ca551f3..492323ce7 100644 --- a/x/dex/types/message_place_limit_order_test.go +++ b/x/dex/types/message_place_limit_order_test.go @@ -4,9 +4,10 @@ import ( "testing" "cosmossdk.io/math" + "github.com/stretchr/testify/require" + "github.com/neutron-org/neutron/testutil/common/sample" . "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" ) func TestMsgPlaceLimitOrder_ValidateBasic(t *testing.T) { diff --git a/x/dex/types/message_withdrawl_filled_limit_order_test.go b/x/dex/types/message_withdrawl_filled_limit_order_test.go index 9ac8b476e..4714bd54d 100644 --- a/x/dex/types/message_withdrawl_filled_limit_order_test.go +++ b/x/dex/types/message_withdrawl_filled_limit_order_test.go @@ -3,9 +3,10 @@ package types_test import ( "testing" + "github.com/stretchr/testify/require" + "github.com/neutron-org/neutron/testutil/common/sample" . "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" ) func TestMsgWithdrawFilledLimitOrder_ValidateBasic(t *testing.T) { diff --git a/x/dex/types/message_withdrawl_test.go b/x/dex/types/message_withdrawl_test.go index 58cfa13c6..c33080b18 100644 --- a/x/dex/types/message_withdrawl_test.go +++ b/x/dex/types/message_withdrawl_test.go @@ -4,9 +4,10 @@ import ( "testing" "cosmossdk.io/math" + "github.com/stretchr/testify/require" + "github.com/neutron-org/neutron/testutil/common/sample" . "github.com/neutron-org/neutron/x/dex/types" - "github.com/stretchr/testify/require" ) func TestMsgWithdrawal_ValidateBasic(t *testing.T) { diff --git a/x/dex/types/pair_id.pb.go b/x/dex/types/pair_id.pb.go index 7ddce416e..cd092e4d4 100644 --- a/x/dex/types/pair_id.pb.go +++ b/x/dex/types/pair_id.pb.go @@ -5,10 +5,11 @@ package types import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/params.go b/x/dex/types/params.go index b62659eac..b939716c6 100644 --- a/x/dex/types/params.go +++ b/x/dex/types/params.go @@ -4,8 +4,9 @@ import ( fmt "fmt" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - math_utils "github.com/neutron-org/neutron/utils/math" "gopkg.in/yaml.v2" + + math_utils "github.com/neutron-org/neutron/utils/math" ) var _ paramtypes.ParamSet = (*Params)(nil) diff --git a/x/dex/types/params.pb.go b/x/dex/types/params.pb.go index 4333552ee..569023bb5 100644 --- a/x/dex/types/params.pb.go +++ b/x/dex/types/params.pb.go @@ -5,12 +5,14 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" - github_com_neutron_org_neutron_utils_math "github.com/neutron-org/neutron/utils/math" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + + github_com_neutron_org_neutron_utils_math "github.com/neutron-org/neutron/utils/math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/pool.pb.go b/x/dex/types/pool.pb.go index 8ddb0f09d..e6a54d726 100644 --- a/x/dex/types/pool.pb.go +++ b/x/dex/types/pool.pb.go @@ -5,11 +5,12 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/pool_liquidity.go b/x/dex/types/pool_liquidity.go index 6456df9e4..402079717 100644 --- a/x/dex/types/pool_liquidity.go +++ b/x/dex/types/pool_liquidity.go @@ -2,6 +2,7 @@ package types import ( "cosmossdk.io/math" + math_utils "github.com/neutron-org/neutron/utils/math" ) diff --git a/x/dex/types/pool_metadata.pb.go b/x/dex/types/pool_metadata.pb.go index 83c059c9a..8e18140ef 100644 --- a/x/dex/types/pool_metadata.pb.go +++ b/x/dex/types/pool_metadata.pb.go @@ -5,10 +5,11 @@ package types import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/pool_reserves.pb.go b/x/dex/types/pool_reserves.pb.go index b060cd429..143a81d10 100644 --- a/x/dex/types/pool_reserves.pb.go +++ b/x/dex/types/pool_reserves.pb.go @@ -5,13 +5,15 @@ package types import ( fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + github_com_neutron_org_neutron_utils_math "github.com/neutron-org/neutron/utils/math" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/pool_test.go b/x/dex/types/pool_test.go index 328ada29f..cdddf859b 100644 --- a/x/dex/types/pool_test.go +++ b/x/dex/types/pool_test.go @@ -4,8 +4,9 @@ import ( "testing" "cosmossdk.io/math" - . "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/assert" + + . "github.com/neutron-org/neutron/x/dex/types" ) func TestCalcGreatestMatchingRatioBothReservesNonZero(t *testing.T) { diff --git a/x/dex/types/query.pb.go b/x/dex/types/query.pb.go index c9aa8017f..011e37043 100644 --- a/x/dex/types/query.pb.go +++ b/x/dex/types/query.pb.go @@ -6,6 +6,11 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + time "time" + _ "github.com/cosmos/cosmos-sdk/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" query "github.com/cosmos/cosmos-sdk/types/query" @@ -13,16 +18,13 @@ import ( grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - github_com_neutron_org_neutron_utils_math "github.com/neutron-org/neutron/utils/math" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" _ "google.golang.org/protobuf/types/known/timestamppb" - io "io" - math "math" - math_bits "math/bits" - time "time" + + github_com_neutron_org_neutron_utils_math "github.com/neutron-org/neutron/utils/math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/tick_liquidity.pb.go b/x/dex/types/tick_liquidity.pb.go index 96df486af..ff20f9cfe 100644 --- a/x/dex/types/tick_liquidity.pb.go +++ b/x/dex/types/tick_liquidity.pb.go @@ -5,11 +5,12 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/tick_liquidity_test.go b/x/dex/types/tick_liquidity_test.go index e16d62c40..3c408bf2a 100644 --- a/x/dex/types/tick_liquidity_test.go +++ b/x/dex/types/tick_liquidity_test.go @@ -4,8 +4,9 @@ import ( "testing" "cosmossdk.io/math" - "github.com/neutron-org/neutron/x/dex/types" "github.com/stretchr/testify/assert" + + "github.com/neutron-org/neutron/x/dex/types" ) func TestHasTokenEmptyReserves(t *testing.T) { diff --git a/x/dex/types/trade_pair_id.go b/x/dex/types/trade_pair_id.go index 4e82ef59a..0c92d5e7b 100644 --- a/x/dex/types/trade_pair_id.go +++ b/x/dex/types/trade_pair_id.go @@ -2,6 +2,7 @@ package types import ( sdkerrors "cosmossdk.io/errors" + math_utils "github.com/neutron-org/neutron/utils/math" ) diff --git a/x/dex/types/trade_pair_id.pb.go b/x/dex/types/trade_pair_id.pb.go index 51f884991..855a1425f 100644 --- a/x/dex/types/trade_pair_id.pb.go +++ b/x/dex/types/trade_pair_id.pb.go @@ -5,10 +5,11 @@ package types import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/tx.pb.go b/x/dex/types/tx.pb.go index d7aed6aba..62754e07a 100644 --- a/x/dex/types/tx.pb.go +++ b/x/dex/types/tx.pb.go @@ -6,6 +6,11 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + time "time" + _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" @@ -15,15 +20,12 @@ import ( grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - github_com_neutron_org_neutron_utils_math "github.com/neutron-org/neutron/utils/math" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" _ "google.golang.org/protobuf/types/known/timestamppb" - io "io" - math "math" - math_bits "math/bits" - time "time" + + github_com_neutron_org_neutron_utils_math "github.com/neutron-org/neutron/utils/math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/utils/math.go b/x/dex/utils/math.go index 23d23e96f..2682b64f4 100644 --- a/x/dex/utils/math.go +++ b/x/dex/utils/math.go @@ -6,6 +6,7 @@ import ( "strconv" sdkmath "cosmossdk.io/math" + math_utils "github.com/neutron-org/neutron/utils/math" ) diff --git a/x/feeburner/client/cli/query_params.go b/x/feeburner/client/cli/query_params.go index 297e59bbb..899ea5427 100644 --- a/x/feeburner/client/cli/query_params.go +++ b/x/feeburner/client/cli/query_params.go @@ -5,8 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/x/feeburner/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/feeburner/types" ) func CmdQueryParams() *cobra.Command { diff --git a/x/feeburner/client/cli/query_total_burned_neutrons_amount.go b/x/feeburner/client/cli/query_total_burned_neutrons_amount.go index cd602ffc2..7837468f7 100644 --- a/x/feeburner/client/cli/query_total_burned_neutrons_amount.go +++ b/x/feeburner/client/cli/query_total_burned_neutrons_amount.go @@ -5,8 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/x/feeburner/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/x/feeburner/types" ) func CmdQueryTotalBurnedNeutronsAmount() *cobra.Command { diff --git a/x/feeburner/genesis_test.go b/x/feeburner/genesis_test.go index 01c00bab6..696d1c13d 100644 --- a/x/feeburner/genesis_test.go +++ b/x/feeburner/genesis_test.go @@ -5,11 +5,12 @@ import ( "github.com/neutron-org/neutron/app" + "github.com/stretchr/testify/require" + "github.com/neutron-org/neutron/testutil/feeburner/keeper" "github.com/neutron-org/neutron/testutil/feeburner/nullify" "github.com/neutron-org/neutron/x/feeburner" "github.com/neutron-org/neutron/x/feeburner/types" - "github.com/stretchr/testify/require" ) func TestGenesis(t *testing.T) { diff --git a/x/feeburner/keeper/grpc_query.go b/x/feeburner/keeper/grpc_query.go index 4a15833b4..041f190d8 100644 --- a/x/feeburner/keeper/grpc_query.go +++ b/x/feeburner/keeper/grpc_query.go @@ -4,6 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/feeburner/types" ) diff --git a/x/feeburner/keeper/grpc_query_params.go b/x/feeburner/keeper/grpc_query_params.go index 4989281c2..d04184d80 100644 --- a/x/feeburner/keeper/grpc_query_params.go +++ b/x/feeburner/keeper/grpc_query_params.go @@ -4,9 +4,10 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/x/feeburner/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/neutron-org/neutron/x/feeburner/types" ) func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { diff --git a/x/feeburner/keeper/msg_server.go b/x/feeburner/keeper/msg_server.go index 8ba291950..1a446da99 100644 --- a/x/feeburner/keeper/msg_server.go +++ b/x/feeburner/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/feeburner/types" ) diff --git a/x/feeburner/keeper/params.go b/x/feeburner/keeper/params.go index a0f442f2a..4dadf2258 100644 --- a/x/feeburner/keeper/params.go +++ b/x/feeburner/keeper/params.go @@ -2,6 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/x/feeburner/types" ) diff --git a/x/feeburner/module.go b/x/feeburner/module.go index b877be3a8..29ec04c41 100644 --- a/x/feeburner/module.go +++ b/x/feeburner/module.go @@ -19,6 +19,7 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" + "github.com/neutron-org/neutron/x/feeburner/client/cli" "github.com/neutron-org/neutron/x/feeburner/keeper" "github.com/neutron-org/neutron/x/feeburner/types" diff --git a/x/feeburner/module_simulation.go b/x/feeburner/module_simulation.go index 167653864..e2fa0a93f 100644 --- a/x/feeburner/module_simulation.go +++ b/x/feeburner/module_simulation.go @@ -7,6 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" + "github.com/neutron-org/neutron/testutil/feeburner/sample" feeburnersimulation "github.com/neutron-org/neutron/x/feeburner/simulation" "github.com/neutron-org/neutron/x/feeburner/types" diff --git a/x/feeburner/types/genesis.pb.go b/x/feeburner/types/genesis.pb.go index 24bdfb280..27a2cabb3 100644 --- a/x/feeburner/types/genesis.pb.go +++ b/x/feeburner/types/genesis.pb.go @@ -5,11 +5,12 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feeburner/types/params.go b/x/feeburner/types/params.go index b6a232068..1f33fb180 100644 --- a/x/feeburner/types/params.go +++ b/x/feeburner/types/params.go @@ -5,8 +5,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/neutron-org/neutron/app/params" "gopkg.in/yaml.v2" + + "github.com/neutron-org/neutron/app/params" ) var _ paramtypes.ParamSet = (*Params)(nil) diff --git a/x/feeburner/types/params.pb.go b/x/feeburner/types/params.pb.go index 10dc2a26b..7161153b2 100644 --- a/x/feeburner/types/params.pb.go +++ b/x/feeburner/types/params.pb.go @@ -5,11 +5,12 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feeburner/types/query.pb.go b/x/feeburner/types/query.pb.go index dc3110aa2..f99671bc7 100644 --- a/x/feeburner/types/query.pb.go +++ b/x/feeburner/types/query.pb.go @@ -6,6 +6,10 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + _ "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" @@ -14,9 +18,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feeburner/types/total_burned_neutrons_amount.pb.go b/x/feeburner/types/total_burned_neutrons_amount.pb.go index 0b562a8e4..cbfcb8388 100644 --- a/x/feeburner/types/total_burned_neutrons_amount.pb.go +++ b/x/feeburner/types/total_burned_neutrons_amount.pb.go @@ -5,12 +5,13 @@ package types import ( fmt "fmt" - types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feeburner/types/tx.pb.go b/x/feeburner/types/tx.pb.go index 27aa64eee..bd7c19eed 100644 --- a/x/feeburner/types/tx.pb.go +++ b/x/feeburner/types/tx.pb.go @@ -6,6 +6,10 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" @@ -15,9 +19,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feerefunder/keeper/keeper.go b/x/feerefunder/keeper/keeper.go index 5322fa3c6..e0ab9b9d5 100644 --- a/x/feerefunder/keeper/keeper.go +++ b/x/feerefunder/keeper/keeper.go @@ -13,6 +13,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + "github.com/neutron-org/neutron/x/feerefunder/types" ) diff --git a/x/feerefunder/keeper/msg_server.go b/x/feerefunder/keeper/msg_server.go index e43bd69ba..9bbb4cff9 100644 --- a/x/feerefunder/keeper/msg_server.go +++ b/x/feerefunder/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/feerefunder/types" ) diff --git a/x/feerefunder/types/fee.pb.go b/x/feerefunder/types/fee.pb.go index deabfddac..0871de5fe 100644 --- a/x/feerefunder/types/fee.pb.go +++ b/x/feerefunder/types/fee.pb.go @@ -5,13 +5,14 @@ package types import ( fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feerefunder/types/genesis.pb.go b/x/feerefunder/types/genesis.pb.go index 49ec297e9..4dbe77e54 100644 --- a/x/feerefunder/types/genesis.pb.go +++ b/x/feerefunder/types/genesis.pb.go @@ -5,11 +5,12 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feerefunder/types/genesis_test.go b/x/feerefunder/types/genesis_test.go index 04dad2cf1..746a8007b 100644 --- a/x/feerefunder/types/genesis_test.go +++ b/x/feerefunder/types/genesis_test.go @@ -4,6 +4,7 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/app/params" "github.com/neutron-org/neutron/app" diff --git a/x/feerefunder/types/params.go b/x/feerefunder/types/params.go index 3b47cbffb..76b6bac55 100644 --- a/x/feerefunder/types/params.go +++ b/x/feerefunder/types/params.go @@ -5,8 +5,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/neutron-org/neutron/app/params" "gopkg.in/yaml.v2" + + "github.com/neutron-org/neutron/app/params" ) var _ paramtypes.ParamSet = (*Params)(nil) diff --git a/x/feerefunder/types/params.pb.go b/x/feerefunder/types/params.pb.go index 1055a3794..f6272fb1e 100644 --- a/x/feerefunder/types/params.pb.go +++ b/x/feerefunder/types/params.pb.go @@ -5,11 +5,12 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feerefunder/types/query.pb.go b/x/feerefunder/types/query.pb.go index 30a8b3b16..d23764d25 100644 --- a/x/feerefunder/types/query.pb.go +++ b/x/feerefunder/types/query.pb.go @@ -6,6 +6,10 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + _ "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" @@ -14,9 +18,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feerefunder/types/tx.pb.go b/x/feerefunder/types/tx.pb.go index 6e2df44ae..4a02f92dc 100644 --- a/x/feerefunder/types/tx.pb.go +++ b/x/feerefunder/types/tx.pb.go @@ -6,6 +6,10 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" @@ -15,9 +19,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibc-hooks/ics4_middleware.go b/x/ibc-hooks/ics4_middleware.go index d866dedd9..f5f01f768 100644 --- a/x/ibc-hooks/ics4_middleware.go +++ b/x/ibc-hooks/ics4_middleware.go @@ -6,6 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + "github.com/neutron-org/neutron/x/ibc-hooks/types" // ibc-go diff --git a/x/ibc-hooks/utils/utils.go b/x/ibc-hooks/utils/utils.go index c092af4db..fa7a43228 100644 --- a/x/ibc-hooks/utils/utils.go +++ b/x/ibc-hooks/utils/utils.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/cosmos/cosmos-sdk/types/address" + "github.com/neutron-org/neutron/x/ibc-hooks/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/ibcswap/keeper/keeper.go b/x/ibcswap/keeper/keeper.go index 2e6073b77..bcbeeb639 100644 --- a/x/ibcswap/keeper/keeper.go +++ b/x/ibcswap/keeper/keeper.go @@ -16,6 +16,7 @@ import ( channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + dextypes "github.com/neutron-org/neutron/x/dex/types" "github.com/neutron-org/neutron/x/ibcswap/types" ) diff --git a/x/ibcswap/module.go b/x/ibcswap/module.go index 8a20873b0..870bcc52d 100644 --- a/x/ibcswap/module.go +++ b/x/ibcswap/module.go @@ -12,9 +12,10 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" + "github.com/neutron-org/neutron/x/ibcswap/keeper" "github.com/neutron-org/neutron/x/ibcswap/types" - "github.com/spf13/cobra" ) var ( diff --git a/x/ibcswap/types/swap.go b/x/ibcswap/types/swap.go index 0aedf4bc8..54af8d1a3 100644 --- a/x/ibcswap/types/swap.go +++ b/x/ibcswap/types/swap.go @@ -6,6 +6,7 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/iancoleman/orderedmap" + dextypes "github.com/neutron-org/neutron/x/dex/types" ) diff --git a/x/interchainqueries/keeper/grpc_query_test.go b/x/interchainqueries/keeper/grpc_query_test.go index 391d58d0f..e4acf5ca4 100644 --- a/x/interchainqueries/keeper/grpc_query_test.go +++ b/x/interchainqueries/keeper/grpc_query_test.go @@ -12,6 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported" + "github.com/neutron-org/neutron/x/interchainqueries/keeper" iqtypes "github.com/neutron-org/neutron/x/interchainqueries/types" ) diff --git a/x/interchainqueries/keeper/process_block_results_test.go b/x/interchainqueries/keeper/process_block_results_test.go index 198acffca..1753622c0 100644 --- a/x/interchainqueries/keeper/process_block_results_test.go +++ b/x/interchainqueries/keeper/process_block_results_test.go @@ -7,6 +7,7 @@ import ( ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" "github.com/golang/mock/gomock" + icqtestkeeper "github.com/neutron-org/neutron/testutil/interchainqueries/keeper" mock_types "github.com/neutron-org/neutron/testutil/mocks/interchainqueries/types" @@ -26,6 +27,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" clientkeeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper" + "github.com/neutron-org/neutron/testutil" iqkeeper "github.com/neutron-org/neutron/x/interchainqueries/keeper" iqtypes "github.com/neutron-org/neutron/x/interchainqueries/types" diff --git a/x/interchainqueries/types/genesis.pb.go b/x/interchainqueries/types/genesis.pb.go index 4a20abcae..f04698ace 100644 --- a/x/interchainqueries/types/genesis.pb.go +++ b/x/interchainqueries/types/genesis.pb.go @@ -5,14 +5,15 @@ package types import ( fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types1 "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" types "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/interchainqueries/types/params.go b/x/interchainqueries/types/params.go index 7731e592b..3842f7b30 100644 --- a/x/interchainqueries/types/params.go +++ b/x/interchainqueries/types/params.go @@ -5,8 +5,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/neutron-org/neutron/app/params" "gopkg.in/yaml.v2" + + "github.com/neutron-org/neutron/app/params" ) var _ paramtypes.ParamSet = (*Params)(nil) diff --git a/x/interchainqueries/types/params.pb.go b/x/interchainqueries/types/params.pb.go index 7236536fd..ae821b3fe 100644 --- a/x/interchainqueries/types/params.pb.go +++ b/x/interchainqueries/types/params.pb.go @@ -5,13 +5,14 @@ package types import ( fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/interchainqueries/types/query.pb.go b/x/interchainqueries/types/query.pb.go index 39aca701b..2135d6341 100644 --- a/x/interchainqueries/types/query.pb.go +++ b/x/interchainqueries/types/query.pb.go @@ -6,6 +6,10 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" @@ -14,9 +18,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/interchainqueries/types/tx.pb.go b/x/interchainqueries/types/tx.pb.go index 5298e2ebe..e54fb380a 100644 --- a/x/interchainqueries/types/tx.pb.go +++ b/x/interchainqueries/types/tx.pb.go @@ -6,6 +6,10 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + types1 "github.com/cometbft/cometbft/abci/types" crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" _ "github.com/cosmos/cosmos-proto" @@ -18,9 +22,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/interchainqueries/types/tx_test.go b/x/interchainqueries/types/tx_test.go index eea4e096d..3b6362691 100644 --- a/x/interchainqueries/types/tx_test.go +++ b/x/interchainqueries/types/tx_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported" + iqtypes "github.com/neutron-org/neutron/x/interchainqueries/types" ) diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index ab65451af..8f0ae6096 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -11,6 +11,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/interchaintxs/types" ) diff --git a/x/interchaintxs/keeper/msg_server.go b/x/interchaintxs/keeper/msg_server.go index 5cde87c49..d0ac0c11d 100644 --- a/x/interchaintxs/keeper/msg_server.go +++ b/x/interchaintxs/keeper/msg_server.go @@ -14,6 +14,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + feetypes "github.com/neutron-org/neutron/x/feerefunder/types" ictxtypes "github.com/neutron-org/neutron/x/interchaintxs/types" ) diff --git a/x/interchaintxs/types/genesis.pb.go b/x/interchaintxs/types/genesis.pb.go index e6a20056e..686af617c 100644 --- a/x/interchaintxs/types/genesis.pb.go +++ b/x/interchaintxs/types/genesis.pb.go @@ -5,11 +5,12 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/interchaintxs/types/params.pb.go b/x/interchaintxs/types/params.pb.go index 844def56c..127cad03c 100644 --- a/x/interchaintxs/types/params.pb.go +++ b/x/interchaintxs/types/params.pb.go @@ -5,12 +5,13 @@ package types import ( fmt "fmt" - types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/interchaintxs/types/query.pb.go b/x/interchaintxs/types/query.pb.go index 6d7ea05e7..71cf17a5c 100644 --- a/x/interchaintxs/types/query.pb.go +++ b/x/interchaintxs/types/query.pb.go @@ -6,6 +6,10 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + _ "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" @@ -14,9 +18,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/interchaintxs/types/tx.pb.go b/x/interchaintxs/types/tx.pb.go index 89d6f5d02..23056bdb5 100644 --- a/x/interchaintxs/types/tx.pb.go +++ b/x/interchaintxs/types/tx.pb.go @@ -6,6 +6,10 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + _ "github.com/cosmos/cosmos-proto" types1 "github.com/cosmos/cosmos-sdk/codec/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" @@ -15,14 +19,12 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - types2 "github.com/neutron-org/neutron/x/feerefunder/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" + + types2 "github.com/neutron-org/neutron/x/feerefunder/types" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/tokenfactory/keeper/msg_server.go b/x/tokenfactory/keeper/msg_server.go index fb29abf3b..3e85704ee 100644 --- a/x/tokenfactory/keeper/msg_server.go +++ b/x/tokenfactory/keeper/msg_server.go @@ -7,6 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + "github.com/neutron-org/neutron/x/tokenfactory/types" ) diff --git a/x/tokenfactory/types/authorityMetadata.pb.go b/x/tokenfactory/types/authorityMetadata.pb.go index 5f0c39198..5a3932270 100644 --- a/x/tokenfactory/types/authorityMetadata.pb.go +++ b/x/tokenfactory/types/authorityMetadata.pb.go @@ -5,12 +5,13 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/tokenfactory/types/genesis.pb.go b/x/tokenfactory/types/genesis.pb.go index c8d948b77..10da9491b 100644 --- a/x/tokenfactory/types/genesis.pb.go +++ b/x/tokenfactory/types/genesis.pb.go @@ -5,11 +5,12 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" + + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/tokenfactory/types/params.pb.go b/x/tokenfactory/types/params.pb.go index 8bea9d12b..e71f0ae6e 100644 --- a/x/tokenfactory/types/params.pb.go +++ b/x/tokenfactory/types/params.pb.go @@ -5,14 +5,15 @@ package types import ( fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/tokenfactory/types/query.pb.go b/x/tokenfactory/types/query.pb.go index 4b58f82a1..123435062 100644 --- a/x/tokenfactory/types/query.pb.go +++ b/x/tokenfactory/types/query.pb.go @@ -6,6 +6,10 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" @@ -13,9 +17,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/tokenfactory/types/tx.pb.go b/x/tokenfactory/types/tx.pb.go index 61a23a8a0..33cf27891 100644 --- a/x/tokenfactory/types/tx.pb.go +++ b/x/tokenfactory/types/tx.pb.go @@ -6,6 +6,10 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" @@ -17,9 +21,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index 813ef54d1..e14c85f34 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -6,6 +6,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + "github.com/neutron-org/neutron/x/contractmanager/keeper" feetypes "github.com/neutron-org/neutron/x/feerefunder/types" "github.com/neutron-org/neutron/x/interchaintxs/types" diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index bdb763b56..eddc57c8d 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -10,13 +10,14 @@ import ( transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/golang/mock/gomock" + "github.com/stretchr/testify/require" + "github.com/neutron-org/neutron/testutil" mock_types "github.com/neutron-org/neutron/testutil/mocks/transfer/types" testkeeper "github.com/neutron-org/neutron/testutil/transfer/keeper" feetypes "github.com/neutron-org/neutron/x/feerefunder/types" ictxtypes "github.com/neutron-org/neutron/x/interchaintxs/types" "github.com/neutron-org/neutron/x/transfer" - "github.com/stretchr/testify/require" ) const TestCosmosAddress = "cosmos10h9stc5v6ntgeygf5xf945njqq5h32r53uquvw" diff --git a/x/transfer/keeper/keeper.go b/x/transfer/keeper/keeper.go index fdae1dcba..940b716b5 100644 --- a/x/transfer/keeper/keeper.go +++ b/x/transfer/keeper/keeper.go @@ -15,6 +15,7 @@ import ( "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + feetypes "github.com/neutron-org/neutron/x/feerefunder/types" wrappedtypes "github.com/neutron-org/neutron/x/transfer/types" ) diff --git a/x/transfer/types/expected_keepers.go b/x/transfer/types/expected_keepers.go index 854b8e490..a834dd3a6 100644 --- a/x/transfer/types/expected_keepers.go +++ b/x/transfer/types/expected_keepers.go @@ -4,6 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" ) diff --git a/x/transfer/types/query.pb.go b/x/transfer/types/query.pb.go index a5eca1746..e3f548872 100644 --- a/x/transfer/types/query.pb.go +++ b/x/transfer/types/query.pb.go @@ -6,6 +6,8 @@ package types import ( context "context" fmt "fmt" + math "math" + grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" types "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" @@ -13,7 +15,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/transfer/types/tx.go b/x/transfer/types/tx.go index 1d1e1ebb2..464a28c95 100644 --- a/x/transfer/types/tx.go +++ b/x/transfer/types/tx.go @@ -4,9 +4,10 @@ import ( "context" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" "google.golang.org/grpc" + feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types" + sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/transfer/types/tx.pb.go b/x/transfer/types/tx.pb.go index 8d2769294..2c7d5daf4 100644 --- a/x/transfer/types/tx.pb.go +++ b/x/transfer/types/tx.pb.go @@ -6,18 +6,20 @@ package types import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" types1 "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - types2 "github.com/neutron-org/neutron/x/feerefunder/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" + + types2 "github.com/neutron-org/neutron/x/feerefunder/types" ) // Reference imports to suppress errors if they are not otherwise used.