From cfd2e5fb9ce7a4096b2d49b654a7674313bf1c45 Mon Sep 17 00:00:00 2001 From: nhpd Date: Mon, 14 Oct 2024 19:40:18 +0400 Subject: [PATCH] make format --- app/app.go | 3 ++- app/proposals_allowlisting.go | 3 ++- app/upgrades/types.go | 5 +++-- x/ibc-rate-limit/client/cli/query.go | 3 ++- x/ibc-rate-limit/genesis_test.go | 3 ++- x/ibc-rate-limit/ibc_middleware_test.go | 3 ++- x/ibc-rate-limit/module.go | 3 ++- x/ibc-rate-limit/module_simulation.go | 1 + x/tokenfactory/keeper/grpc_query.go | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/app/app.go b/app/app.go index 5f45e3f26..cc393733c 100644 --- a/app/app.go +++ b/app/app.go @@ -17,7 +17,7 @@ import ( feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types" "github.com/neutron-org/neutron/v5/x/dynamicfees" - "github.com/neutron-org/neutron/v5/x/ibc-rate-limit" + ibcratelimit "github.com/neutron-org/neutron/v5/x/ibc-rate-limit" "cosmossdk.io/client/v2/autocli" "cosmossdk.io/core/appmodule" @@ -135,6 +135,7 @@ import ( ibcratelimitkeeper "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/keeper" ibcratelimittypes "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" + //nolint:staticcheck ibcporttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types" ibchost "github.com/cosmos/ibc-go/v8/modules/core/exported" diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index e68cd1b46..646f9d890 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -16,10 +16,11 @@ import ( ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck ccvconsumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - ibcratelimittypes "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types" marketmaptypes "github.com/skip-mev/slinky/x/marketmap/types" + ibcratelimittypes "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" + dynamicfeestypes "github.com/neutron-org/neutron/v5/x/dynamicfees/types" globalfeetypes "github.com/neutron-org/neutron/v5/x/globalfee/types" diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 6a313828f..8c52a43b2 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -13,12 +13,13 @@ import ( slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" ccvconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" - dexkeeper "github.com/neutron-org/neutron/v5/x/dex/keeper" - ibcratelimitkeeper "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/keeper" auctionkeeper "github.com/skip-mev/block-sdk/v2/x/auction/keeper" feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper" marketmapkeeper "github.com/skip-mev/slinky/x/marketmap/keeper" + dexkeeper "github.com/neutron-org/neutron/v5/x/dex/keeper" + ibcratelimitkeeper "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/keeper" + dynamicfeeskeeper "github.com/neutron-org/neutron/v5/x/dynamicfees/keeper" contractmanagerkeeper "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" diff --git a/x/ibc-rate-limit/client/cli/query.go b/x/ibc-rate-limit/client/cli/query.go index 50126ff5d..324363b04 100644 --- a/x/ibc-rate-limit/client/cli/query.go +++ b/x/ibc-rate-limit/client/cli/query.go @@ -5,8 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" "github.com/spf13/cobra" + + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/ibc-rate-limit/genesis_test.go b/x/ibc-rate-limit/genesis_test.go index c2bd546f8..957ec60e8 100644 --- a/x/ibc-rate-limit/genesis_test.go +++ b/x/ibc-rate-limit/genesis_test.go @@ -4,9 +4,10 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" "github.com/stretchr/testify/suite" + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" + "github.com/neutron-org/neutron/v5/testutil/apptesting" ) diff --git a/x/ibc-rate-limit/ibc_middleware_test.go b/x/ibc-rate-limit/ibc_middleware_test.go index e70f2815f..dfdcb6ee0 100644 --- a/x/ibc-rate-limit/ibc_middleware_test.go +++ b/x/ibc-rate-limit/ibc_middleware_test.go @@ -10,10 +10,11 @@ import ( sdkmath "cosmossdk.io/math" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" - "github.com/neutron-org/neutron/v5/testutil" "github.com/stretchr/testify/require" "golang.org/x/exp/slices" + "github.com/neutron-org/neutron/v5/testutil" + bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" abci "github.com/cometbft/cometbft/abci/types" diff --git a/x/ibc-rate-limit/module.go b/x/ibc-rate-limit/module.go index aa794bf49..c5af0cff3 100644 --- a/x/ibc-rate-limit/module.go +++ b/x/ibc-rate-limit/module.go @@ -6,9 +6,10 @@ import ( "fmt" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/keeper" "github.com/spf13/cobra" + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/keeper" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" diff --git a/x/ibc-rate-limit/module_simulation.go b/x/ibc-rate-limit/module_simulation.go index 0bc601524..081c8b40a 100644 --- a/x/ibc-rate-limit/module_simulation.go +++ b/x/ibc-rate-limit/module_simulation.go @@ -6,6 +6,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/v5/testutil/common/sample" ibcratelimitsimulation "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/simulation" "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" diff --git a/x/tokenfactory/keeper/grpc_query.go b/x/tokenfactory/keeper/grpc_query.go index d47af2337..5881b02ab 100644 --- a/x/tokenfactory/keeper/grpc_query.go +++ b/x/tokenfactory/keeper/grpc_query.go @@ -2,9 +2,10 @@ package keeper import ( "context" - "cosmossdk.io/errors" "fmt" + "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/neutron-org/neutron/v5/x/tokenfactory/types"