From 7e67de1c15419658f890ef8f86c9b26fda0ba37e Mon Sep 17 00:00:00 2001 From: Christian Gorenflo Date: Mon, 6 Nov 2023 18:08:51 -0500 Subject: [PATCH] fix merge --- app/keepers.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/keepers.go b/app/keepers.go index f00d804eb..a4fd0927f 100644 --- a/app/keepers.go +++ b/app/keepers.go @@ -258,7 +258,7 @@ func initIBCKeeper(appCodec codec.Codec, keys map[string]*sdk.KVStoreKey, keeper func initIBCTransferKeeper(appCodec codec.Codec, keys map[string]*sdk.KVStoreKey, keepers *keeperCache, ics4Wrapper ibctransfertypes.ICS4Wrapper, scopedTransferK capabilitykeeper.ScopedKeeper) *ibctransferkeeper.Keeper { transferK := ibctransferkeeper.NewKeeper( - appCodec, keys[ibctransfertypes.StoreKey], getSubspace(keepers, ibctransfertypes.ModuleName), + appCodec, keys[ibctransfertypes.StoreKey], keepers.getSubspace(ibctransfertypes.ModuleName), // Use the IBC middleware stack ics4Wrapper, getKeeperAsRef[ibckeeper.Keeper](keepers).ChannelKeeper, &getKeeperAsRef[ibckeeper.Keeper](keepers).PortKeeper, @@ -274,7 +274,7 @@ func initAxelarIBCKeeper(keepers *keeperCache) *axelarnetKeeper.IBCKeeper { func initAxelarnetKeeper(appCodec codec.Codec, keys map[string]*sdk.KVStoreKey, keepers *keeperCache) *axelarnetKeeper.Keeper { axelarnetK := axelarnetKeeper.NewKeeper( - appCodec, keys[axelarnetTypes.StoreKey], getSubspace(keepers, axelarnetTypes.ModuleName), getKeeperAsRef[ibckeeper.Keeper](keepers).ChannelKeeper, getKeeper[feegrantkeeper.Keeper](keepers), + appCodec, keys[axelarnetTypes.StoreKey], keepers.getSubspace(axelarnetTypes.ModuleName), getKeeperAsRef[ibckeeper.Keeper](keepers).ChannelKeeper, getKeeper[feegrantkeeper.Keeper](keepers), ) return &axelarnetK }