diff --git a/Makefile b/Makefile index 1fa051881..0cecb6827 100644 --- a/Makefile +++ b/Makefile @@ -97,7 +97,7 @@ docker-build-debug: lint: @find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' -not -name '*.gw.go' | xargs go run mvdan.cc/gofumpt -w . @find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' -not -name '*.gw.go' | xargs go run github.com/client9/misspell/cmd/misspell -w - @find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' -not -name '*.gw.go' | xargs go run golang.org/x/tools/cmd/goimports -w -local github.com/notional-labs/composable-centauri + @find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' -not -name '*.gw.go' | xargs go run golang.org/x/tools/cmd/goimports -w -local github.com/notional-labs/centauri .PHONY: lint ############################################################################### diff --git a/app/ante/ante.go b/app/ante/ante.go index e0b86cafb..f0ecf3cb5 100644 --- a/app/ante/ante.go +++ b/app/ante/ante.go @@ -9,6 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ante "github.com/cosmos/cosmos-sdk/x/auth/ante" "github.com/cosmos/cosmos-sdk/x/auth/signing" + tfmwKeeper "github.com/notional-labs/centauri/v4/x/transfermiddleware/keeper" ) diff --git a/app/ante/ibc_ante.go b/app/ante/ibc_ante.go index ebae1b5b7..34a4ad95b 100644 --- a/app/ante/ibc_ante.go +++ b/app/ante/ibc_ante.go @@ -9,6 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/authz" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + tfmwKeeper "github.com/notional-labs/centauri/v4/x/transfermiddleware/keeper" ) diff --git a/app/app.go b/app/app.go index 0cf2dbd9e..c463a837a 100644 --- a/app/app.go +++ b/app/app.go @@ -85,13 +85,14 @@ import ( icq "github.com/strangelove-ventures/async-icq/v7" icqtypes "github.com/strangelove-ventures/async-icq/v7/types" - custombankmodule "github.com/notional-labs/centauri/v4/custom/bank" "github.com/strangelove-ventures/packet-forward-middleware/v7/router" routertypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types" alliancemodule "github.com/terra-money/alliance/x/alliance" alliancemoduleclient "github.com/terra-money/alliance/x/alliance/client" alliancemoduletypes "github.com/terra-money/alliance/x/alliance/types" + custombankmodule "github.com/notional-labs/centauri/v4/custom/bank" + "github.com/notional-labs/centauri/v4/app/ante" transfermiddleware "github.com/notional-labs/centauri/v4/x/transfermiddleware" transfermiddlewaretypes "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" @@ -112,6 +113,7 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + v4_5 "github.com/notional-labs/centauri/v4/app/upgrades/v4_5" v4_5_1 "github.com/notional-labs/centauri/v4/app/upgrades/v4_5_1" diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go index 5c5db303f..fc2208c91 100644 --- a/app/helpers/test_helpers.go +++ b/app/helpers/test_helpers.go @@ -21,8 +21,9 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/ibc-go/v7/testing/mock" - centauri "github.com/notional-labs/centauri/v4/app" "github.com/stretchr/testify/require" + + centauri "github.com/notional-labs/centauri/v4/app" ) // SimAppChainID hardcoded chainID for simulation diff --git a/app/ibctesting/chain.go b/app/ibctesting/chain.go index c61d29598..1e53f8dea 100644 --- a/app/ibctesting/chain.go +++ b/app/ibctesting/chain.go @@ -51,11 +51,12 @@ import ( ibctesting "github.com/cosmos/ibc-go/v7/testing" "github.com/cosmos/ibc-go/v7/testing/mock" ibctestingtypes "github.com/cosmos/ibc-go/v7/testing/types" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/suite" + centauri "github.com/notional-labs/centauri/v4/app" "github.com/notional-labs/centauri/v4/app/ibctesting/simapp" routerKeeper "github.com/notional-labs/centauri/v4/x/transfermiddleware/keeper" - "github.com/stretchr/testify/require" - "github.com/stretchr/testify/suite" ) // TestChain is a testing struct that wraps a simapp with the last TM Header, the current ABCI diff --git a/app/ibctesting/simapp/app.go b/app/ibctesting/simapp/app.go index 2ce90278c..78f04432a 100644 --- a/app/ibctesting/simapp/app.go +++ b/app/ibctesting/simapp/app.go @@ -123,6 +123,7 @@ import ( wasm08 "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/keeper" ibcmock "github.com/cosmos/ibc-go/v7/testing/mock" ibctestingtypes "github.com/cosmos/ibc-go/v7/testing/types" + simappparams "github.com/notional-labs/centauri/v4/app/ibctesting/simapp/params" simappupgrades "github.com/notional-labs/centauri/v4/app/ibctesting/simapp/upgrades" v6 "github.com/notional-labs/centauri/v4/app/ibctesting/simapp/upgrades/v6" diff --git a/app/ibctesting/simapp/sim_test.go b/app/ibctesting/simapp/sim_test.go index 5c0a3ead5..121b2fd00 100644 --- a/app/ibctesting/simapp/sim_test.go +++ b/app/ibctesting/simapp/sim_test.go @@ -28,9 +28,10 @@ import ( "github.com/cosmos/cosmos-sdk/x/simulation" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - minttypes "github.com/notional-labs/centauri/v4/x/mint/types" "github.com/stretchr/testify/require" + minttypes "github.com/notional-labs/centauri/v4/x/mint/types" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ) diff --git a/app/keepers/keys.go b/app/keepers/keys.go index 6126eb791..664dd902f 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -34,6 +34,7 @@ import ( consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" + minttypes "github.com/notional-labs/centauri/v4/x/mint/types" "github.com/CosmWasm/wasmd/x/wasm" diff --git a/app/test_access.go b/app/test_access.go index c1ca828d4..eedc05478 100644 --- a/app/test_access.go +++ b/app/test_access.go @@ -15,6 +15,7 @@ import ( ibctransferkeeper "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" wasm08 "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/keeper" + ratelimitkeeper "github.com/notional-labs/centauri/v4/x/ratelimit/keeper" tfmdKeeper "github.com/notional-labs/centauri/v4/x/transfermiddleware/keeper" ) diff --git a/app/test_helpers.go b/app/test_helpers.go index 0f0cb67a8..53de76ebd 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -35,6 +35,7 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + minttypes "github.com/notional-labs/centauri/v4/x/mint/types" "github.com/CosmWasm/wasmd/x/wasm" diff --git a/app/upgrades/reward/upgrade.go b/app/upgrades/reward/upgrade.go index 461a99a9b..75e56612b 100644 --- a/app/upgrades/reward/upgrade.go +++ b/app/upgrades/reward/upgrade.go @@ -4,6 +4,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" + mintkeeper "github.com/notional-labs/centauri/v4/x/mint/keeper" tfmwkeeper "github.com/notional-labs/centauri/v4/x/transfermiddleware/keeper" ) diff --git a/app/upgrades/v4/constants.go b/app/upgrades/v4/constants.go index 488219e92..5e889c57e 100644 --- a/app/upgrades/v4/constants.go +++ b/app/upgrades/v4/constants.go @@ -4,6 +4,7 @@ import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" store "github.com/cosmos/cosmos-sdk/store/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" + "github.com/notional-labs/centauri/v4/app/upgrades" ibchookstypes "github.com/notional-labs/centauri/v4/x/ibc-hooks/types" ratelimitmoduletypes "github.com/notional-labs/centauri/v4/x/ratelimit/types" diff --git a/app/upgrades/v4/upgrade.go b/app/upgrades/v4/upgrade.go index fb4b474b1..5e3807e1d 100644 --- a/app/upgrades/v4/upgrade.go +++ b/app/upgrades/v4/upgrade.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/notional-labs/centauri/v4/app/keepers" "github.com/notional-labs/centauri/v4/app/upgrades" tfmdtypes "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" diff --git a/bech32-migration/slashing/slashing.go b/bech32-migration/slashing/slashing.go index 16473eeea..6d34399ea 100644 --- a/bech32-migration/slashing/slashing.go +++ b/bech32-migration/slashing/slashing.go @@ -5,6 +5,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/slashing/types" + "github.com/notional-labs/centauri/v4/bech32-migration/utils" ) diff --git a/bech32-migration/staking/staking.go b/bech32-migration/staking/staking.go index 88742fe6d..7e500a31f 100644 --- a/bech32-migration/staking/staking.go +++ b/bech32-migration/staking/staking.go @@ -5,6 +5,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/notional-labs/centauri/v4/bech32-migration/utils" ) diff --git a/cmd/centaurid/cmd/genaccounts.go b/cmd/centaurid/cmd/genaccounts.go index 3121f98af..b18d8d62c 100644 --- a/cmd/centaurid/cmd/genaccounts.go +++ b/cmd/centaurid/cmd/genaccounts.go @@ -6,9 +6,10 @@ import ( "errors" "fmt" - "github.com/notional-labs/centauri/v4/bech32-migration/utils" "github.com/spf13/cobra" + "github.com/notional-labs/centauri/v4/bech32-migration/utils" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/keyring" diff --git a/custom/bank/bank_test.go b/custom/bank/bank_test.go index bb72961e4..ed208413a 100644 --- a/custom/bank/bank_test.go +++ b/custom/bank/bank_test.go @@ -8,8 +8,9 @@ import ( ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - customibctesting "github.com/notional-labs/centauri/v4/app/ibctesting" "github.com/stretchr/testify/suite" + + customibctesting "github.com/notional-labs/centauri/v4/app/ibctesting" ) type CustomBankTestSuite struct { diff --git a/custom/bank/keeper/keeper.go b/custom/bank/keeper/keeper.go index 2e5b54536..67cdd22da 100644 --- a/custom/bank/keeper/keeper.go +++ b/custom/bank/keeper/keeper.go @@ -10,10 +10,11 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" "github.com/cosmos/cosmos-sdk/x/bank/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - banktypes "github.com/notional-labs/centauri/v4/custom/bank/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + banktypes "github.com/notional-labs/centauri/v4/custom/bank/types" + transfermiddlewarekeeper "github.com/notional-labs/centauri/v4/x/transfermiddleware/keeper" alliancekeeper "github.com/terra-money/alliance/x/alliance/keeper" diff --git a/x/ibc-hooks/client/cli/query.go b/x/ibc-hooks/client/cli/query.go index 0350649e4..79169a6a2 100644 --- a/x/ibc-hooks/client/cli/query.go +++ b/x/ibc-hooks/client/cli/query.go @@ -7,9 +7,10 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" - "github.com/notional-labs/centauri/v4/x/ibc-hooks/keeper" "github.com/spf13/cobra" + "github.com/notional-labs/centauri/v4/x/ibc-hooks/keeper" + "github.com/notional-labs/centauri/v4/x/ibc-hooks/types" ) diff --git a/x/ibc-hooks/keeper/keeper.go b/x/ibc-hooks/keeper/keeper.go index 26edf4b4a..3cb774575 100644 --- a/x/ibc-hooks/keeper/keeper.go +++ b/x/ibc-hooks/keeper/keeper.go @@ -7,6 +7,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" + "github.com/notional-labs/centauri/v4/x/ibc-hooks/types" ) diff --git a/x/ibc-hooks/relay_test.go b/x/ibc-hooks/relay_test.go index 996f3d2a0..3eb779f2b 100644 --- a/x/ibc-hooks/relay_test.go +++ b/x/ibc-hooks/relay_test.go @@ -8,9 +8,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + "github.com/stretchr/testify/suite" + customibctesting "github.com/notional-labs/centauri/v4/app/ibctesting" ibchookskeeper "github.com/notional-labs/centauri/v4/x/ibc-hooks/keeper" - "github.com/stretchr/testify/suite" ) // TODO: use testsuite here. diff --git a/x/ibc-hooks/wasm_hook.go b/x/ibc-hooks/wasm_hook.go index a475fb5de..d7e8a1c36 100644 --- a/x/ibc-hooks/wasm_hook.go +++ b/x/ibc-hooks/wasm_hook.go @@ -10,6 +10,7 @@ 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" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + "github.com/notional-labs/centauri/v4/x/ibc-hooks/keeper" "github.com/notional-labs/centauri/v4/x/ibc-hooks/types" diff --git a/x/mint/abci.go b/x/mint/abci.go index c48d68482..929bc5a06 100644 --- a/x/mint/abci.go +++ b/x/mint/abci.go @@ -5,6 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/notional-labs/centauri/v4/x/mint/keeper" "github.com/notional-labs/centauri/v4/x/mint/types" ) diff --git a/x/mint/client/cli/query.go b/x/mint/client/cli/query.go index a9713bc5b..8c17c4e00 100644 --- a/x/mint/client/cli/query.go +++ b/x/mint/client/cli/query.go @@ -7,6 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/notional-labs/centauri/v4/x/mint/types" ) diff --git a/x/mint/client/cli/tx.go b/x/mint/client/cli/tx.go index 435980406..0837d2d67 100644 --- a/x/mint/client/cli/tx.go +++ b/x/mint/client/cli/tx.go @@ -5,8 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/centauri/v4/x/mint/types" "github.com/spf13/cobra" + + "github.com/notional-labs/centauri/v4/x/mint/types" ) // GetTxCmd returns the tx commands for mint diff --git a/x/mint/keeper/genesis.go b/x/mint/keeper/genesis.go index 9c923c992..f866823ed 100644 --- a/x/mint/keeper/genesis.go +++ b/x/mint/keeper/genesis.go @@ -2,6 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/notional-labs/centauri/v4/x/mint/types" ) diff --git a/x/mint/keeper/grpc_query.go b/x/mint/keeper/grpc_query.go index 9602beab9..62ed90e40 100644 --- a/x/mint/keeper/grpc_query.go +++ b/x/mint/keeper/grpc_query.go @@ -4,6 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/notional-labs/centauri/v4/x/mint/types" ) diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index eecd683d7..9cf41f3bd 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -9,6 +9,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/notional-labs/centauri/v4/x/mint/types" ) diff --git a/x/mint/keeper/msg_server.go b/x/mint/keeper/msg_server.go index 3a14411be..124f25b39 100644 --- a/x/mint/keeper/msg_server.go +++ b/x/mint/keeper/msg_server.go @@ -7,6 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + "github.com/notional-labs/centauri/v4/x/mint/types" ) diff --git a/x/mint/module.go b/x/mint/module.go index 1a154dc78..022167197 100644 --- a/x/mint/module.go +++ b/x/mint/module.go @@ -15,6 +15,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/notional-labs/centauri/v4/x/mint/client/cli" "github.com/notional-labs/centauri/v4/x/mint/keeper" "github.com/notional-labs/centauri/v4/x/mint/simulation" diff --git a/x/mint/simulation/decoder.go b/x/mint/simulation/decoder.go index 5853e8151..1672b2c12 100644 --- a/x/mint/simulation/decoder.go +++ b/x/mint/simulation/decoder.go @@ -6,6 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" + "github.com/notional-labs/centauri/v4/x/mint/types" ) diff --git a/x/mint/simulation/decoder_test.go b/x/mint/simulation/decoder_test.go index 1a05a4862..62f53539f 100644 --- a/x/mint/simulation/decoder_test.go +++ b/x/mint/simulation/decoder_test.go @@ -9,6 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" "github.com/cosmos/cosmos-sdk/types/module/testutil" + "github.com/notional-labs/centauri/v4/x/mint/simulation" centauriminttypes "github.com/notional-labs/centauri/v4/x/mint/types" ) diff --git a/x/mint/simulation/genesis.go b/x/mint/simulation/genesis.go index 6c5d9d1a5..5359d2305 100644 --- a/x/mint/simulation/genesis.go +++ b/x/mint/simulation/genesis.go @@ -8,6 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/notional-labs/centauri/v4/x/mint/types" ) diff --git a/x/mint/simulation/genesis_test.go b/x/mint/simulation/genesis_test.go index 3f8ed9974..d02138e61 100644 --- a/x/mint/simulation/genesis_test.go +++ b/x/mint/simulation/genesis_test.go @@ -13,6 +13,7 @@ import ( moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/mint" + "github.com/notional-labs/centauri/v4/x/mint/simulation" "github.com/notional-labs/centauri/v4/x/mint/types" ) diff --git a/x/mint/simulation/proposals.go b/x/mint/simulation/proposals.go index cf2aaa720..1ecc11e3a 100644 --- a/x/mint/simulation/proposals.go +++ b/x/mint/simulation/proposals.go @@ -7,6 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/address" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" + "github.com/notional-labs/centauri/v4/x/mint/types" ) diff --git a/x/mint/simulation/proposals_test.go b/x/mint/simulation/proposals_test.go index 14ae52098..d6226bb9f 100644 --- a/x/mint/simulation/proposals_test.go +++ b/x/mint/simulation/proposals_test.go @@ -10,6 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/notional-labs/centauri/v4/x/mint/simulation" "github.com/notional-labs/centauri/v4/x/mint/types" ) diff --git a/x/ratelimit/client/cli/tx.go b/x/ratelimit/client/cli/tx.go index 38a11e5ba..fed5a5efe 100644 --- a/x/ratelimit/client/cli/tx.go +++ b/x/ratelimit/client/cli/tx.go @@ -3,8 +3,9 @@ package cli import ( "fmt" - "github.com/notional-labs/centauri/v4/x/ratelimit/types" "github.com/spf13/cobra" + + "github.com/notional-labs/centauri/v4/x/ratelimit/types" ) // GetTxCmd returns the tx commands for router diff --git a/x/ratelimit/keeper/abci.go b/x/ratelimit/keeper/abci.go index 8e3aace1b..e89e28456 100644 --- a/x/ratelimit/keeper/abci.go +++ b/x/ratelimit/keeper/abci.go @@ -6,6 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/notional-labs/centauri/v4/x/ratelimit/types" ) diff --git a/x/ratelimit/keeper/genesis.go b/x/ratelimit/keeper/genesis.go index c6da50481..fa7e38365 100644 --- a/x/ratelimit/keeper/genesis.go +++ b/x/ratelimit/keeper/genesis.go @@ -5,6 +5,7 @@ import ( "strings" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/notional-labs/centauri/v4/x/ratelimit/types" ) diff --git a/x/ratelimit/keeper/grpc_query.go b/x/ratelimit/keeper/grpc_query.go index 7798e6a40..246492477 100644 --- a/x/ratelimit/keeper/grpc_query.go +++ b/x/ratelimit/keeper/grpc_query.go @@ -7,6 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibctmtypes "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + "github.com/notional-labs/centauri/v4/x/ratelimit/types" ) diff --git a/x/ratelimit/keeper/keeper.go b/x/ratelimit/keeper/keeper.go index b7b5d5970..f9b4dc8f1 100644 --- a/x/ratelimit/keeper/keeper.go +++ b/x/ratelimit/keeper/keeper.go @@ -9,6 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + "github.com/notional-labs/centauri/v4/x/ratelimit/types" tfmwkeeper "github.com/notional-labs/centauri/v4/x/transfermiddleware/keeper" ) diff --git a/x/ratelimit/keeper/msg_server.go b/x/ratelimit/keeper/msg_server.go index 9048997ba..254535548 100644 --- a/x/ratelimit/keeper/msg_server.go +++ b/x/ratelimit/keeper/msg_server.go @@ -6,6 +6,7 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + "github.com/notional-labs/centauri/v4/x/ratelimit/types" ) diff --git a/x/ratelimit/keeper/rate_limit.go b/x/ratelimit/keeper/rate_limit.go index 0909f44c5..f1cf35992 100644 --- a/x/ratelimit/keeper/rate_limit.go +++ b/x/ratelimit/keeper/rate_limit.go @@ -10,6 +10,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/notional-labs/centauri/v4/x/ratelimit/types" ) diff --git a/x/ratelimit/module.go b/x/ratelimit/module.go index 6c51bc925..d14753c8d 100644 --- a/x/ratelimit/module.go +++ b/x/ratelimit/module.go @@ -14,10 +14,11 @@ 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/notional-labs/centauri/v4/x/ratelimit/client/cli" "github.com/notional-labs/centauri/v4/x/ratelimit/keeper" "github.com/notional-labs/centauri/v4/x/ratelimit/types" - "github.com/spf13/cobra" ) var ( diff --git a/x/ratelimit/relay_test.go b/x/ratelimit/relay_test.go index e23fd1fab..ad64ac8a0 100644 --- a/x/ratelimit/relay_test.go +++ b/x/ratelimit/relay_test.go @@ -6,9 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + "github.com/stretchr/testify/suite" + customibctesting "github.com/notional-labs/centauri/v4/app/ibctesting" ratelimittypes "github.com/notional-labs/centauri/v4/x/ratelimit/types" - "github.com/stretchr/testify/suite" ) type RateLimitTestSuite struct { diff --git a/x/transfermiddleware/client/cli/cli.go b/x/transfermiddleware/client/cli/cli.go index 01e9a86f4..353f3918a 100644 --- a/x/transfermiddleware/client/cli/cli.go +++ b/x/transfermiddleware/client/cli/cli.go @@ -6,8 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" "github.com/spf13/cobra" + + "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" ) // GetQueryCmd returns the query commands for router diff --git a/x/transfermiddleware/client/cli/tx.go b/x/transfermiddleware/client/cli/tx.go index 6ef982dc8..864e5c2ef 100644 --- a/x/transfermiddleware/client/cli/tx.go +++ b/x/transfermiddleware/client/cli/tx.go @@ -7,8 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" "github.com/cosmos/cosmos-sdk/version" - "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" "github.com/spf13/cobra" + + "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" ) // GetTxCmd returns the tx commands for router diff --git a/x/transfermiddleware/ibc_ante_test.go b/x/transfermiddleware/ibc_ante_test.go index 8009f1ac0..c5b8e5216 100644 --- a/x/transfermiddleware/ibc_ante_test.go +++ b/x/transfermiddleware/ibc_ante_test.go @@ -10,8 +10,9 @@ import ( "github.com/cosmos/ibc-go/v7/modules/core/exported" wasmkeeper "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/keeper" wasmtypes "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" - customibctesting "github.com/notional-labs/centauri/v4/app/ibctesting" "github.com/stretchr/testify/suite" + + customibctesting "github.com/notional-labs/centauri/v4/app/ibctesting" ) var govAuthorityAddress = "centauri10556m38z4x6pqalr9rl5ytf3cff8q46nk85k9m" diff --git a/x/transfermiddleware/ibc_middleware.go b/x/transfermiddleware/ibc_middleware.go index 1df5eb7d6..de9df6c0a 100644 --- a/x/transfermiddleware/ibc_middleware.go +++ b/x/transfermiddleware/ibc_middleware.go @@ -10,6 +10,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" + "github.com/notional-labs/centauri/v4/x/transfermiddleware/keeper" ) diff --git a/x/transfermiddleware/keeper/abci.go b/x/transfermiddleware/keeper/abci.go index deb42c4aa..be0e79310 100644 --- a/x/transfermiddleware/keeper/abci.go +++ b/x/transfermiddleware/keeper/abci.go @@ -2,6 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" ) diff --git a/x/transfermiddleware/keeper/genesis.go b/x/transfermiddleware/keeper/genesis.go index 84639e543..b7ef22292 100644 --- a/x/transfermiddleware/keeper/genesis.go +++ b/x/transfermiddleware/keeper/genesis.go @@ -2,6 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" ) diff --git a/x/transfermiddleware/keeper/genesis_test.go b/x/transfermiddleware/keeper/genesis_test.go index 984cb3aca..c8e0ddb8b 100644 --- a/x/transfermiddleware/keeper/genesis_test.go +++ b/x/transfermiddleware/keeper/genesis_test.go @@ -3,9 +3,10 @@ package keeper_test import ( "testing" + "github.com/stretchr/testify/require" + helpers "github.com/notional-labs/centauri/v4/app/helpers" "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" - "github.com/stretchr/testify/require" ) func TestTFMInitGenesis(t *testing.T) { diff --git a/x/transfermiddleware/keeper/grpc_query.go b/x/transfermiddleware/keeper/grpc_query.go index 696c09815..4edfcaadf 100644 --- a/x/transfermiddleware/keeper/grpc_query.go +++ b/x/transfermiddleware/keeper/grpc_query.go @@ -5,6 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" ) diff --git a/x/transfermiddleware/keeper/ics4wrapper.go b/x/transfermiddleware/keeper/ics4wrapper.go index 65b9d8d92..25f545b39 100644 --- a/x/transfermiddleware/keeper/ics4wrapper.go +++ b/x/transfermiddleware/keeper/ics4wrapper.go @@ -11,6 +11,7 @@ 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" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" ) diff --git a/x/transfermiddleware/keeper/keeper.go b/x/transfermiddleware/keeper/keeper.go index dc1bb1b67..fd0a42cb2 100644 --- a/x/transfermiddleware/keeper/keeper.go +++ b/x/transfermiddleware/keeper/keeper.go @@ -13,6 +13,7 @@ import ( transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" + "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" ) diff --git a/x/transfermiddleware/keeper/msg_server.go b/x/transfermiddleware/keeper/msg_server.go index e089d4a1d..931be29c2 100644 --- a/x/transfermiddleware/keeper/msg_server.go +++ b/x/transfermiddleware/keeper/msg_server.go @@ -8,6 +8,7 @@ import ( "cosmossdk.io/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" ) diff --git a/x/transfermiddleware/keeper/params.go b/x/transfermiddleware/keeper/params.go index 49755cbfc..e25206c39 100644 --- a/x/transfermiddleware/keeper/params.go +++ b/x/transfermiddleware/keeper/params.go @@ -2,6 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" ) diff --git a/x/transfermiddleware/keeper/relay.go b/x/transfermiddleware/keeper/relay.go index c7494af3e..43da90242 100644 --- a/x/transfermiddleware/keeper/relay.go +++ b/x/transfermiddleware/keeper/relay.go @@ -5,6 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" 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/notional-labs/centauri/v4/x/transfermiddleware/types" ) diff --git a/x/transfermiddleware/module.go b/x/transfermiddleware/module.go index 92aadb7df..9d7874bf3 100644 --- a/x/transfermiddleware/module.go +++ b/x/transfermiddleware/module.go @@ -14,10 +14,11 @@ 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/notional-labs/centauri/v4/x/transfermiddleware/client/cli" "github.com/notional-labs/centauri/v4/x/transfermiddleware/keeper" "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" - "github.com/spf13/cobra" ) var ( diff --git a/x/transfermiddleware/pfm_test.go b/x/transfermiddleware/pfm_test.go index af7a3784f..804a7d881 100644 --- a/x/transfermiddleware/pfm_test.go +++ b/x/transfermiddleware/pfm_test.go @@ -11,8 +11,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - customibctesting "github.com/notional-labs/centauri/v4/app/ibctesting" "github.com/stretchr/testify/suite" + + customibctesting "github.com/notional-labs/centauri/v4/app/ibctesting" ) type PacketMetadata struct { diff --git a/x/transfermiddleware/relay_test.go b/x/transfermiddleware/relay_test.go index bf610025f..7c7ec36ca 100644 --- a/x/transfermiddleware/relay_test.go +++ b/x/transfermiddleware/relay_test.go @@ -8,8 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - customibctesting "github.com/notional-labs/centauri/v4/app/ibctesting" "github.com/stretchr/testify/suite" + + customibctesting "github.com/notional-labs/centauri/v4/app/ibctesting" ) // TODO: use testsuite here. diff --git a/x/transfermiddleware/types/info_test.go b/x/transfermiddleware/types/info_test.go index 52010caa0..0c22ea5b4 100644 --- a/x/transfermiddleware/types/info_test.go +++ b/x/transfermiddleware/types/info_test.go @@ -3,8 +3,9 @@ package types_test import ( "testing" - "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" "github.com/stretchr/testify/require" + + "github.com/notional-labs/centauri/v4/x/transfermiddleware/types" ) func TestValidateBasic(t *testing.T) {