From 2999051918f8fe7bbb81900d440be3cc4fe0c388 Mon Sep 17 00:00:00 2001 From: Puneet <59960662+puneet2019@users.noreply.github.com> Date: Wed, 3 Jan 2024 12:51:05 +0530 Subject: [PATCH] reorg imports to make linter happy. (#712) --- app/encoding.go | 4 ++-- app/export.go | 1 - app/sim_test.go | 9 ++++----- cmd/pstaked/cmd/genaccounts.go | 3 +-- cmd/pstaked/cmd/testnet.go | 5 ++--- cmd/pstaked/main.go | 1 + interchaintest/setup.go | 7 +++---- x/liquidstake/client/cli/query.go | 3 +-- x/liquidstake/client/cli/tx.go | 3 +-- x/liquidstake/keeper/grpc_query.go | 3 +-- x/liquidstake/keeper/grpc_query_test.go | 3 +-- x/liquidstake/keeper/keeper_test.go | 7 +++---- x/liquidstake/keeper/liquidstake.go | 2 +- x/liquidstake/module.go | 7 +++---- x/liquidstakeibc/keeper/abci_test.go | 4 +++- x/liquidstakeibc/keeper/deposit.go | 2 +- x/liquidstakeibc/keeper/grpc_querier.go | 3 +-- x/liquidstakeibc/keeper/invariants_test.go | 1 + x/liquidstakeibc/keeper/keeper_test.go | 1 + x/liquidstakeibc/keeper/msg_server_test.go | 1 - x/liquidstakeibc/keeper/rebalance_test.go | 4 +++- x/liquidstakeibc/keeper/redelegation.go | 1 + x/liquidstakeibc/keeper/redelegation_txs.go | 1 + x/liquidstakeibc/types/hooks.go | 1 - x/ratesync/genesis.go | 1 + x/ratesync/genesis_test.go | 6 +++--- x/ratesync/keeper/chain_test.go | 8 ++++---- x/ratesync/keeper/hooks.go | 1 + x/ratesync/keeper/ibc.go | 7 ++++--- x/ratesync/keeper/msg_server.go | 8 ++++---- x/ratesync/keeper/msg_server_test.go | 2 +- x/ratesync/keeper/query_test.go | 6 ++++-- x/ratesync/keeper/setup_suite_test.go | 7 ++++--- x/ratesync/module.go | 1 - x/ratesync/module_simulation.go | 1 + x/ratesync/simulation/msg_update_params.go | 1 + x/ratesync/types/expected_keepers.go | 1 + x/ratesync/types/genesis_test.go | 3 ++- x/ratesync/types/msgs.go | 1 + x/ratesync/types/msgs_test.go | 7 ++++--- x/ratesync/types/types.go | 1 + 41 files changed, 73 insertions(+), 66 deletions(-) diff --git a/app/encoding.go b/app/encoding.go index d970ee93a..9b192418a 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -1,9 +1,9 @@ package app import ( - "github.com/persistenceOne/pstake-native/v2/app/params" - "github.com/cosmos/cosmos-sdk/std" + + "github.com/persistenceOne/pstake-native/v2/app/params" ) // MakeEncodingConfig creates an EncodingConfig for testing diff --git a/app/export.go b/app/export.go index 4106d17a1..e24a8403c 100644 --- a/app/export.go +++ b/app/export.go @@ -5,7 +5,6 @@ import ( "log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - servertypes "github.com/cosmos/cosmos-sdk/server/types" sdk "github.com/cosmos/cosmos-sdk/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" diff --git a/app/sim_test.go b/app/sim_test.go index 0cf78e41f..66a0aa576 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -6,20 +6,19 @@ import ( "os" "testing" - pstake "github.com/persistenceOne/pstake-native/v2/app" - dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" "github.com/cometbft/cometbft/libs/rand" - "github.com/persistenceOne/pstake-native/v2/app/helpers" - "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/store" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli" + "github.com/stretchr/testify/require" + + pstake "github.com/persistenceOne/pstake-native/v2/app" + "github.com/persistenceOne/pstake-native/v2/app/helpers" ) func init() { diff --git a/cmd/pstaked/cmd/genaccounts.go b/cmd/pstaked/cmd/genaccounts.go index c7f9d6de8..4186e0b16 100644 --- a/cmd/pstaked/cmd/genaccounts.go +++ b/cmd/pstaked/cmd/genaccounts.go @@ -6,8 +6,6 @@ import ( "errors" "fmt" - "github.com/spf13/cobra" - "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/keyring" @@ -18,6 +16,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" + "github.com/spf13/cobra" ) const ( diff --git a/cmd/pstaked/cmd/testnet.go b/cmd/pstaked/cmd/testnet.go index e1eba0026..12bff6a6f 100644 --- a/cmd/pstaked/cmd/testnet.go +++ b/cmd/pstaked/cmd/testnet.go @@ -15,9 +15,6 @@ import ( tmrand "github.com/cometbft/cometbft/libs/rand" "github.com/cometbft/cometbft/types" tmtime "github.com/cometbft/cometbft/types/time" - "github.com/spf13/cobra" - "github.com/spf13/pflag" - "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" @@ -36,6 +33,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/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/spf13/cobra" + "github.com/spf13/pflag" "github.com/persistenceOne/pstake-native/v2/app/params" ) diff --git a/cmd/pstaked/main.go b/cmd/pstaked/main.go index 7ed9c82ab..cbfd2b9fb 100644 --- a/cmd/pstaked/main.go +++ b/cmd/pstaked/main.go @@ -6,6 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" sdkTypes "github.com/cosmos/cosmos-sdk/types" + "github.com/persistenceOne/pstake-native/v2/app" "github.com/persistenceOne/pstake-native/v2/cmd/pstaked/cmd" ) diff --git a/interchaintest/setup.go b/interchaintest/setup.go index f077959a1..bd279cb43 100644 --- a/interchaintest/setup.go +++ b/interchaintest/setup.go @@ -5,17 +5,16 @@ import ( "fmt" "testing" - "github.com/docker/docker/client" - "github.com/stretchr/testify/require" - "go.uber.org/zap/zaptest" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" testutil "github.com/cosmos/cosmos-sdk/types/module/testutil" ibclocalhost "github.com/cosmos/ibc-go/v7/modules/light-clients/09-localhost" + "github.com/docker/docker/client" interchaintest "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" "github.com/strangelove-ventures/interchaintest/v7/testreporter" + "github.com/stretchr/testify/require" + "go.uber.org/zap/zaptest" ) var ( diff --git a/x/liquidstake/client/cli/query.go b/x/liquidstake/client/cli/query.go index e3e940f03..e9fdb1c1b 100644 --- a/x/liquidstake/client/cli/query.go +++ b/x/liquidstake/client/cli/query.go @@ -4,11 +4,10 @@ import ( "fmt" "strings" - "github.com/spf13/cobra" - "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" + "github.com/spf13/cobra" "github.com/persistenceOne/pstake-native/v2/x/liquidstake/types" ) diff --git a/x/liquidstake/client/cli/tx.go b/x/liquidstake/client/cli/tx.go index 2cd697087..d49f0bd72 100644 --- a/x/liquidstake/client/cli/tx.go +++ b/x/liquidstake/client/cli/tx.go @@ -9,13 +9,12 @@ import ( "os" "strings" - "github.com/spf13/cobra" - "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" + "github.com/spf13/cobra" "github.com/persistenceOne/pstake-native/v2/x/liquidstake/types" ) diff --git a/x/liquidstake/keeper/grpc_query.go b/x/liquidstake/keeper/grpc_query.go index 221034541..7f3bd3fb9 100644 --- a/x/liquidstake/keeper/grpc_query.go +++ b/x/liquidstake/keeper/grpc_query.go @@ -3,11 +3,10 @@ package keeper import ( "context" + sdk "github.com/cosmos/cosmos-sdk/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/persistenceOne/pstake-native/v2/x/liquidstake/types" ) diff --git a/x/liquidstake/keeper/grpc_query_test.go b/x/liquidstake/keeper/grpc_query_test.go index af48220b6..b084642d5 100644 --- a/x/liquidstake/keeper/grpc_query_test.go +++ b/x/liquidstake/keeper/grpc_query_test.go @@ -2,12 +2,11 @@ package keeper_test import ( "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" _ "github.com/stretchr/testify/suite" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/persistenceOne/pstake-native/v2/x/liquidstake/types" ) diff --git a/x/liquidstake/keeper/keeper_test.go b/x/liquidstake/keeper/keeper_test.go index a641af3e7..a14483cc1 100644 --- a/x/liquidstake/keeper/keeper_test.go +++ b/x/liquidstake/keeper/keeper_test.go @@ -6,8 +6,6 @@ import ( "time" "cosmossdk.io/math" - "github.com/stretchr/testify/suite" - abci "github.com/cometbft/cometbft/abci/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" @@ -17,11 +15,12 @@ import ( "github.com/cosmos/cosmos-sdk/x/crisis" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" + "github.com/cosmos/cosmos-sdk/x/mint" + minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/stretchr/testify/suite" - "github.com/cosmos/cosmos-sdk/x/mint" - minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" chain "github.com/persistenceOne/pstake-native/v2/app" testhelpers "github.com/persistenceOne/pstake-native/v2/app/helpers" "github.com/persistenceOne/pstake-native/v2/x/liquidstake" diff --git a/x/liquidstake/keeper/liquidstake.go b/x/liquidstake/keeper/liquidstake.go index 5099c5549..b32c9146c 100644 --- a/x/liquidstake/keeper/liquidstake.go +++ b/x/liquidstake/keeper/liquidstake.go @@ -6,11 +6,11 @@ import ( "cosmossdk.io/errors" "cosmossdk.io/math" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/persistenceOne/pstake-native/v2/x/liquidstake/types" ) diff --git a/x/liquidstake/module.go b/x/liquidstake/module.go index 127fb309c..eb15f54a8 100644 --- a/x/liquidstake/module.go +++ b/x/liquidstake/module.go @@ -6,15 +6,14 @@ import ( "fmt" abci "github.com/cometbft/cometbft/abci/types" - "github.com/gorilla/mux" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/spf13/cobra" - sdkclient "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" + "github.com/gorilla/mux" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" "github.com/persistenceOne/pstake-native/v2/x/liquidstake/client/cli" "github.com/persistenceOne/pstake-native/v2/x/liquidstake/keeper" diff --git a/x/liquidstakeibc/keeper/abci_test.go b/x/liquidstakeibc/keeper/abci_test.go index 477d3fb94..690d5843b 100644 --- a/x/liquidstakeibc/keeper/abci_test.go +++ b/x/liquidstakeibc/keeper/abci_test.go @@ -1,12 +1,14 @@ package keeper_test import ( + "time" + sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" - "time" ) func (suite *IntegrationTestSuite) TestKeeper_BeginBlockCode() { diff --git a/x/liquidstakeibc/keeper/deposit.go b/x/liquidstakeibc/keeper/deposit.go index 9dca878a9..3a6d41c25 100644 --- a/x/liquidstakeibc/keeper/deposit.go +++ b/x/liquidstakeibc/keeper/deposit.go @@ -1,9 +1,9 @@ package keeper import ( - errorsmod "cosmossdk.io/errors" "strconv" + errorsmod "cosmossdk.io/errors" "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/liquidstakeibc/keeper/grpc_querier.go b/x/liquidstakeibc/keeper/grpc_querier.go index 6e67efb74..dd39ab30c 100644 --- a/x/liquidstakeibc/keeper/grpc_querier.go +++ b/x/liquidstakeibc/keeper/grpc_querier.go @@ -3,13 +3,12 @@ package keeper import ( "context" + sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" ) diff --git a/x/liquidstakeibc/keeper/invariants_test.go b/x/liquidstakeibc/keeper/invariants_test.go index 6b7fc187a..788a03270 100644 --- a/x/liquidstakeibc/keeper/invariants_test.go +++ b/x/liquidstakeibc/keeper/invariants_test.go @@ -2,6 +2,7 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/keeper" ) diff --git a/x/liquidstakeibc/keeper/keeper_test.go b/x/liquidstakeibc/keeper/keeper_test.go index c792f1d2c..6422d88a0 100644 --- a/x/liquidstakeibc/keeper/keeper_test.go +++ b/x/liquidstakeibc/keeper/keeper_test.go @@ -9,6 +9,7 @@ import ( commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine" + "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" ) diff --git a/x/liquidstakeibc/keeper/msg_server_test.go b/x/liquidstakeibc/keeper/msg_server_test.go index 09157cda9..4eccd2eb9 100644 --- a/x/liquidstakeibc/keeper/msg_server_test.go +++ b/x/liquidstakeibc/keeper/msg_server_test.go @@ -7,7 +7,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ibctfrtypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/keeper" diff --git a/x/liquidstakeibc/keeper/rebalance_test.go b/x/liquidstakeibc/keeper/rebalance_test.go index d568b604d..4eb3224d5 100644 --- a/x/liquidstakeibc/keeper/rebalance_test.go +++ b/x/liquidstakeibc/keeper/rebalance_test.go @@ -1,12 +1,14 @@ package keeper_test import ( + "testing" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/cosmos/gogoproto/proto" + "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" - "testing" ) func (suite *IntegrationTestSuite) TestKeeper_Rebalance() { diff --git a/x/liquidstakeibc/keeper/redelegation.go b/x/liquidstakeibc/keeper/redelegation.go index b1b2d375a..2d1b15ec0 100644 --- a/x/liquidstakeibc/keeper/redelegation.go +++ b/x/liquidstakeibc/keeper/redelegation.go @@ -4,6 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" ) diff --git a/x/liquidstakeibc/keeper/redelegation_txs.go b/x/liquidstakeibc/keeper/redelegation_txs.go index 6f5e40768..e5bb2ec68 100644 --- a/x/liquidstakeibc/keeper/redelegation_txs.go +++ b/x/liquidstakeibc/keeper/redelegation_txs.go @@ -3,6 +3,7 @@ package keeper import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" ) diff --git a/x/liquidstakeibc/types/hooks.go b/x/liquidstakeibc/types/hooks.go index 89c75c00e..73355b23a 100644 --- a/x/liquidstakeibc/types/hooks.go +++ b/x/liquidstakeibc/types/hooks.go @@ -2,7 +2,6 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/persistenceOne/persistence-sdk/v2/utils" ) diff --git a/x/ratesync/genesis.go b/x/ratesync/genesis.go index 03585dd1a..dd6c24a0e 100644 --- a/x/ratesync/genesis.go +++ b/x/ratesync/genesis.go @@ -2,6 +2,7 @@ package ratesync import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/persistenceOne/pstake-native/v2/x/ratesync/keeper" "github.com/persistenceOne/pstake-native/v2/x/ratesync/types" ) diff --git a/x/ratesync/genesis_test.go b/x/ratesync/genesis_test.go index d10dcbee0..d3a7d9648 100644 --- a/x/ratesync/genesis_test.go +++ b/x/ratesync/genesis_test.go @@ -1,13 +1,13 @@ package ratesync_test import ( - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/persistenceOne/pstake-native/v2/app/helpers" - liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" "testing" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + "github.com/persistenceOne/pstake-native/v2/app/helpers" + liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" "github.com/persistenceOne/pstake-native/v2/x/ratesync" "github.com/persistenceOne/pstake-native/v2/x/ratesync/types" ) diff --git a/x/ratesync/keeper/chain_test.go b/x/ratesync/keeper/chain_test.go index 4bf5b6eab..e16a76c32 100644 --- a/x/ratesync/keeper/chain_test.go +++ b/x/ratesync/keeper/chain_test.go @@ -1,14 +1,14 @@ package keeper_test import ( - ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" "strconv" + sdk "github.com/cosmos/cosmos-sdk/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + + liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" "github.com/persistenceOne/pstake-native/v2/x/ratesync/keeper" "github.com/persistenceOne/pstake-native/v2/x/ratesync/types" - - sdk "github.com/cosmos/cosmos-sdk/types" ) // Prevent strconv unused error diff --git a/x/ratesync/keeper/hooks.go b/x/ratesync/keeper/hooks.go index 9b4ee4fd8..3e410f586 100644 --- a/x/ratesync/keeper/hooks.go +++ b/x/ratesync/keeper/hooks.go @@ -5,6 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" epochtypes "github.com/persistenceOne/persistence-sdk/v2/x/epochs/types" + liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" "github.com/persistenceOne/pstake-native/v2/x/ratesync/types" ) diff --git a/x/ratesync/keeper/ibc.go b/x/ratesync/keeper/ibc.go index 994abb3d6..7ebe33882 100644 --- a/x/ratesync/keeper/ibc.go +++ b/x/ratesync/keeper/ibc.go @@ -1,18 +1,19 @@ package keeper import ( - errorsmod "cosmossdk.io/errors" "encoding/json" "fmt" + "strconv" + + errorsmod "cosmossdk.io/errors" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" - "strconv" + liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" "github.com/persistenceOne/pstake-native/v2/x/ratesync/types" ) diff --git a/x/ratesync/keeper/msg_server.go b/x/ratesync/keeper/msg_server.go index 6832c5bd2..5696d711c 100644 --- a/x/ratesync/keeper/msg_server.go +++ b/x/ratesync/keeper/msg_server.go @@ -4,16 +4,16 @@ import ( "context" "encoding/json" "fmt" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - "github.com/cosmos/gogoproto/proto" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "slices" errorsmod "cosmossdk.io/errors" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" + "github.com/cosmos/gogoproto/proto" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" "github.com/persistenceOne/pstake-native/v2/x/ratesync/types" ) diff --git a/x/ratesync/keeper/msg_server_test.go b/x/ratesync/keeper/msg_server_test.go index 702a703e8..ac00fe8bd 100644 --- a/x/ratesync/keeper/msg_server_test.go +++ b/x/ratesync/keeper/msg_server_test.go @@ -2,12 +2,12 @@ package keeper_test import ( "context" - liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" "testing" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" "github.com/persistenceOne/pstake-native/v2/x/ratesync/keeper" "github.com/persistenceOne/pstake-native/v2/x/ratesync/types" ) diff --git a/x/ratesync/keeper/query_test.go b/x/ratesync/keeper/query_test.go index d5a017958..b703dc177 100644 --- a/x/ratesync/keeper/query_test.go +++ b/x/ratesync/keeper/query_test.go @@ -1,12 +1,14 @@ package keeper_test import ( + "testing" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/persistenceOne/pstake-native/v2/x/ratesync/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "testing" + + "github.com/persistenceOne/pstake-native/v2/x/ratesync/types" ) func (suite *IntegrationTestSuite) TestParamsQuery() { diff --git a/x/ratesync/keeper/setup_suite_test.go b/x/ratesync/keeper/setup_suite_test.go index e0289f2b1..f57faeb24 100644 --- a/x/ratesync/keeper/setup_suite_test.go +++ b/x/ratesync/keeper/setup_suite_test.go @@ -2,6 +2,9 @@ package keeper_test import ( "fmt" + "strconv" + "testing" + sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" @@ -10,13 +13,11 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibctesting "github.com/cosmos/ibc-go/v7/testing" - "github.com/persistenceOne/pstake-native/v2/x/ratesync/types" "github.com/stretchr/testify/suite" - "strconv" - "testing" "github.com/persistenceOne/pstake-native/v2/app" "github.com/persistenceOne/pstake-native/v2/app/helpers" + "github.com/persistenceOne/pstake-native/v2/x/ratesync/types" ) var ( diff --git a/x/ratesync/module.go b/x/ratesync/module.go index 5e779104d..3eb2c3a90 100644 --- a/x/ratesync/module.go +++ b/x/ratesync/module.go @@ -4,7 +4,6 @@ import ( "context" "encoding/json" "fmt" - // this line is used by starport scaffolding # 1 abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" diff --git a/x/ratesync/module_simulation.go b/x/ratesync/module_simulation.go index 57526ad33..02a83af7e 100644 --- a/x/ratesync/module_simulation.go +++ b/x/ratesync/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" + ratesyncsimulation "github.com/persistenceOne/pstake-native/v2/x/ratesync/simulation" "github.com/persistenceOne/pstake-native/v2/x/ratesync/types" ) diff --git a/x/ratesync/simulation/msg_update_params.go b/x/ratesync/simulation/msg_update_params.go index e7e3e6068..544e5775d 100644 --- a/x/ratesync/simulation/msg_update_params.go +++ b/x/ratesync/simulation/msg_update_params.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/persistenceOne/pstake-native/v2/x/ratesync/keeper" "github.com/persistenceOne/pstake-native/v2/x/ratesync/types" ) diff --git a/x/ratesync/types/expected_keepers.go b/x/ratesync/types/expected_keepers.go index 5bc557b3e..c29133133 100644 --- a/x/ratesync/types/expected_keepers.go +++ b/x/ratesync/types/expected_keepers.go @@ -4,6 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" persistencetypes "github.com/persistenceOne/persistence-sdk/v2/x/epochs/types" + liquidstaketypes "github.com/persistenceOne/pstake-native/v2/x/liquidstake/types" liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" ) diff --git a/x/ratesync/types/genesis_test.go b/x/ratesync/types/genesis_test.go index 7e8c7888d..6e668d585 100644 --- a/x/ratesync/types/genesis_test.go +++ b/x/ratesync/types/genesis_test.go @@ -3,8 +3,9 @@ package types_test import ( "testing" - "github.com/persistenceOne/pstake-native/v2/x/ratesync/types" "github.com/stretchr/testify/require" + + "github.com/persistenceOne/pstake-native/v2/x/ratesync/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/ratesync/types/msgs.go b/x/ratesync/types/msgs.go index 751ad329e..9bccfbdf9 100644 --- a/x/ratesync/types/msgs.go +++ b/x/ratesync/types/msgs.go @@ -4,6 +4,7 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" ) diff --git a/x/ratesync/types/msgs_test.go b/x/ratesync/types/msgs_test.go index 46868005e..dbbc81830 100644 --- a/x/ratesync/types/msgs_test.go +++ b/x/ratesync/types/msgs_test.go @@ -1,14 +1,15 @@ package types import ( - sdk "github.com/cosmos/cosmos-sdk/types" - ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" "testing" + sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" "github.com/stretchr/testify/require" + + "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" ) var ValidHostChainInMsg = func(id uint64) HostChain { diff --git a/x/ratesync/types/types.go b/x/ratesync/types/types.go index c2156c96c..79a075502 100644 --- a/x/ratesync/types/types.go +++ b/x/ratesync/types/types.go @@ -12,6 +12,7 @@ import ( icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + liquidstakeibctypes "github.com/persistenceOne/pstake-native/v2/x/liquidstakeibc/types" )