diff --git a/app.go b/app.go index 8b090a74f11a..325fde488c85 100644 --- a/app.go +++ b/app.go @@ -31,6 +31,8 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/cosmos/cosmos-sdk/x/ibc" transfer "github.com/cosmos/cosmos-sdk/x/ibc-transfer" + ibctransferkeeper "github.com/cosmos/cosmos-sdk/x/ibc-transfer/keeper" + ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc-transfer/types" ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/02-client" port "github.com/cosmos/cosmos-sdk/x/ibc/05-port" ibchost "github.com/cosmos/cosmos-sdk/x/ibc/24-host" @@ -95,7 +97,7 @@ var ( stakingtypes.BondedPoolName: {auth.Burner, auth.Staking}, stakingtypes.NotBondedPoolName: {auth.Burner, auth.Staking}, govtypes.ModuleName: {auth.Burner}, - transfer.ModuleName: {auth.Minter, auth.Burner}, + ibctransfertypes.ModuleName: {auth.Minter, auth.Burner}, } // module accounts that are allowed to receive tokens @@ -138,7 +140,7 @@ type SimApp struct { ParamsKeeper paramskeeper.Keeper IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly EvidenceKeeper evidence.Keeper - TransferKeeper transfer.Keeper + TransferKeeper ibctransferkeeper.Keeper // make scoped keepers public for test purposes ScopedIBCKeeper capability.ScopedKeeper @@ -168,7 +170,7 @@ func NewSimApp( auth.StoreKey, bank.StoreKey, stakingtypes.StoreKey, minttypes.StoreKey, distr.StoreKey, slashingtypes.StoreKey, govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey, - evidence.StoreKey, transfer.StoreKey, capability.StoreKey, + evidence.StoreKey, ibctransfertypes.StoreKey, capability.StoreKey, ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) memKeys := sdk.NewMemoryStoreKeys(capability.MemStoreKey) @@ -201,7 +203,7 @@ func NewSimApp( // add capability keeper and ScopeToModule for ibc module app.CapabilityKeeper = capability.NewKeeper(appCodec, keys[capability.StoreKey], memKeys[capability.MemStoreKey]) scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibchost.ModuleName) - scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(transfer.ModuleName) + scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName) // add keepers app.AccountKeeper = auth.NewAccountKeeper( @@ -254,8 +256,8 @@ func NewSimApp( ) // Create Transfer Keepers - app.TransferKeeper = transfer.NewKeeper( - appCodec, keys[transfer.StoreKey], + app.TransferKeeper = ibctransferkeeper.NewKeeper( + appCodec, keys[ibctransfertypes.StoreKey], app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper, app.AccountKeeper, app.BankKeeper, scopedTransferKeeper, ) @@ -263,7 +265,7 @@ func NewSimApp( // Create static IBC router, add transfer route, then set and seal it ibcRouter := port.NewRouter() - ibcRouter.AddRoute(transfer.ModuleName, transferModule) + ibcRouter.AddRoute(ibctransfertypes.ModuleName, transferModule) app.IBCKeeper.SetRouter(ibcRouter) // create evidence keeper with router @@ -314,7 +316,7 @@ func NewSimApp( app.mm.SetOrderInitGenesis( capability.ModuleName, auth.ModuleName, distr.ModuleName, stakingtypes.ModuleName, bank.ModuleName, slashingtypes.ModuleName, govtypes.ModuleName, minttypes.ModuleName, crisis.ModuleName, - ibchost.ModuleName, genutiltypes.ModuleName, evidence.ModuleName, transfer.ModuleName, + ibchost.ModuleName, genutiltypes.ModuleName, evidence.ModuleName, ibctransfertypes.ModuleName, ) app.mm.RegisterInvariants(&app.CrisisKeeper) diff --git a/sim_test.go b/sim_test.go index 48a6ec1c5c1e..e6254c0a44e3 100644 --- a/sim_test.go +++ b/sim_test.go @@ -23,7 +23,7 @@ import ( distr "github.com/cosmos/cosmos-sdk/x/distribution" "github.com/cosmos/cosmos-sdk/x/evidence" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - transfer "github.com/cosmos/cosmos-sdk/x/ibc-transfer" + ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc-transfer/types" ibchost "github.com/cosmos/cosmos-sdk/x/ibc/24-host" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" @@ -163,7 +163,7 @@ func TestAppImportExport(t *testing.T) { {app.keys[evidence.StoreKey], newApp.keys[evidence.StoreKey], [][]byte{}}, {app.keys[capability.StoreKey], newApp.keys[capability.StoreKey], [][]byte{}}, {app.keys[ibchost.StoreKey], newApp.keys[ibchost.StoreKey], [][]byte{}}, - {app.keys[transfer.StoreKey], newApp.keys[transfer.StoreKey], [][]byte{}}, + {app.keys[ibctransfertypes.StoreKey], newApp.keys[ibctransfertypes.StoreKey], [][]byte{}}, } for _, skp := range storeKeysPrefixes {