diff --git a/modules/apps/27-interchain-accounts/keeper/keeper.go b/modules/apps/27-interchain-accounts/keeper/keeper.go index 63b3e82fcea..f10f5b8678d 100644 --- a/modules/apps/27-interchain-accounts/keeper/keeper.go +++ b/modules/apps/27-interchain-accounts/keeper/keeper.go @@ -22,8 +22,6 @@ type Keeper struct { storeKey sdk.StoreKey cdc codec.BinaryCodec - hook types.IBCAccountHooks - channelKeeper types.ChannelKeeper portKeeper types.PortKeeper accountKeeper types.AccountKeeper @@ -37,7 +35,7 @@ type Keeper struct { func NewKeeper( cdc codec.BinaryCodec, key sdk.StoreKey, channelKeeper types.ChannelKeeper, portKeeper types.PortKeeper, - accountKeeper types.AccountKeeper, scopedKeeper capabilitykeeper.ScopedKeeper, msgRouter *baseapp.MsgServiceRouter, hook types.IBCAccountHooks, + accountKeeper types.AccountKeeper, scopedKeeper capabilitykeeper.ScopedKeeper, msgRouter *baseapp.MsgServiceRouter, ) Keeper { // ensure ibc interchain accounts module account is set @@ -53,7 +51,6 @@ func NewKeeper( accountKeeper: accountKeeper, scopedKeeper: scopedKeeper, msgRouter: msgRouter, - hook: hook, } } diff --git a/modules/apps/27-interchain-accounts/keeper/relay.go b/modules/apps/27-interchain-accounts/keeper/relay.go index afdfda2c8d0..f01bb02aba2 100644 --- a/modules/apps/27-interchain-accounts/keeper/relay.go +++ b/modules/apps/27-interchain-accounts/keeper/relay.go @@ -215,22 +215,7 @@ func (k Keeper) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet) error } func (k Keeper) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes.Packet, data types.InterchainAccountPacketData, ack channeltypes.Acknowledgement) error { - switch ack.Response.(type) { - case *channeltypes.Acknowledgement_Error: - if k.hook != nil { - k.hook.OnTxFailed(ctx, packet.SourcePort, packet.SourceChannel, packet.Data, data.Data) - } - return nil - case *channeltypes.Acknowledgement_Result: - if k.hook != nil { - k.hook.OnTxSucceeded(ctx, packet.SourcePort, packet.SourceChannel, packet.Data, data.Data) - } - return nil - default: - // the acknowledgement succeeded on the receiving chain so nothing - // needs to be executed and no error needs to be returned - return nil - } + return nil } // OnTimeoutPacket removes the active channel associated with the provided packet, the underlying channel end is closed diff --git a/testing/simapp/app.go b/testing/simapp/app.go index c158e3fead7..00f1a631bfa 100644 --- a/testing/simapp/app.go +++ b/testing/simapp/app.go @@ -335,7 +335,7 @@ func NewSimApp( app.ICAKeeper = icakeeper.NewKeeper( appCodec, keys[icatypes.StoreKey], app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper, - app.AccountKeeper, scopedICAKeeper, app.MsgServiceRouter(), app, + app.AccountKeeper, scopedICAKeeper, app.MsgServiceRouter(), ) icaModule := ica.NewAppModule(app.ICAKeeper) icaIBCModule := ica.NewIBCModule(app.ICAKeeper, nil) @@ -682,10 +682,3 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino return paramsKeeper } - -// Interchain Accounts code -func (*SimApp) OnTxSucceeded(ctx sdk.Context, sourcePort, sourceChannel string, txHash []byte, txBytes []byte) { -} - -func (*SimApp) OnTxFailed(ctx sdk.Context, sourcePort, sourceChannel string, txHash []byte, txBytes []byte) { -}