diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 317a450cce..b6857b0258 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -6,6 +6,9 @@ import ( feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper" feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types" + "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/bindings" + tokenfactorykeeper "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/keeper" + tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types" pfmrouter "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward" pfmrouterkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/keeper" @@ -78,9 +81,6 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/bindings" - tokenfactorykeeper "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/keeper" - tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types" "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" diff --git a/app/modules.go b/app/modules.go index 38ff5f10cc..2c965df9b2 100644 --- a/app/modules.go +++ b/app/modules.go @@ -3,6 +3,8 @@ package gaia import ( feemarket "github.com/skip-mev/feemarket/x/feemarket" feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types" + "github.com/strangelove-ventures/tokenfactory/x/tokenfactory" + tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types" pfmroutertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types" ratelimittypes "github.com/cosmos/ibc-apps/modules/rate-limiting/v8/types" @@ -64,9 +66,6 @@ import ( "github.com/cosmos/gaia/v23/x/metaprotocols" metaprotocolstypes "github.com/cosmos/gaia/v23/x/metaprotocols/types" - - "github.com/strangelove-ventures/tokenfactory/x/tokenfactory" - tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types" ) var maccPerms = map[string][]string{ diff --git a/app/upgrades/v23/upgrades.go b/app/upgrades/v23/upgrades.go index bdf2a01849..b325d5387e 100644 --- a/app/upgrades/v23/upgrades.go +++ b/app/upgrades/v23/upgrades.go @@ -3,6 +3,9 @@ package v23 import ( "context" + tokenfactorykeeper "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/keeper" + tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types" + errorsmod "cosmossdk.io/errors" "cosmossdk.io/math" upgradetypes "cosmossdk.io/x/upgrade/types" @@ -10,9 +13,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - tokenfactorykeeper "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/keeper" - tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types" - "github.com/cosmos/gaia/v23/app/keepers" ) diff --git a/tests/e2e/chain.go b/tests/e2e/chain.go index 73db33ad93..8fdaa48276 100644 --- a/tests/e2e/chain.go +++ b/tests/e2e/chain.go @@ -4,6 +4,8 @@ import ( "fmt" "os" + tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types" + tmrand "github.com/cometbft/cometbft/libs/rand" dbm "github.com/cosmos/cosmos-db" @@ -30,7 +32,6 @@ import ( gaia "github.com/cosmos/gaia/v23/app" gaiaparams "github.com/cosmos/gaia/v23/app/params" metaprotocoltypes "github.com/cosmos/gaia/v23/x/metaprotocols/types" - tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types" ) const ( diff --git a/tests/e2e/e2e_exec_test.go b/tests/e2e/e2e_exec_test.go index d2ed9e235f..c4a02a59ba 100644 --- a/tests/e2e/e2e_exec_test.go +++ b/tests/e2e/e2e_exec_test.go @@ -12,6 +12,7 @@ import ( "time" "github.com/ory/dockertest/v3/docker" + tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types" "cosmossdk.io/x/feegrant" @@ -23,7 +24,6 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types" ) const ( diff --git a/tests/e2e/genesis.go b/tests/e2e/genesis.go index b681a0efa0..ff60bac43f 100644 --- a/tests/e2e/genesis.go +++ b/tests/e2e/genesis.go @@ -6,6 +6,7 @@ import ( "time" feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types" + tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types" icagen "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/genesis/types" icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types" @@ -23,7 +24,6 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govlegacytypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types" ) func modifyGenesis(path, moniker, amountStr string, addrAll []sdk.AccAddress, basefee string, denom string) error { diff --git a/tests/e2e/query.go b/tests/e2e/query.go index 9664634729..83ef236ade 100644 --- a/tests/e2e/query.go +++ b/tests/e2e/query.go @@ -7,6 +7,8 @@ import ( "net/http" "strings" + tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types" + ratelimittypes "github.com/cosmos/ibc-apps/modules/rate-limiting/v8/types" icacontrollertypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/types" providertypes "github.com/cosmos/interchain-security/v6/x/ccv/provider/types" @@ -21,7 +23,6 @@ import ( govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types" ) func queryGaiaTx(endpoint, txHash string) error {