dispatch submessages from ibc handlers

This commit is contained in:
Ethan Frey
2021-03-10 19:19:27 +01:00
parent ea04c10db5
commit 200a2e949c

View File

@@ -66,8 +66,7 @@ func (k Keeper) OnConnectChannel(
events := types.ParseEvents(res.Attributes, contractAddr)
ctx.EventManager().EmitEvents(events)
// TODO: add submessages support here (and everywhere else) once https://github.com/CosmWasm/cosmwasm/issues/822 is merged
if err := k.dispatchAll(ctx, contractAddr, contractInfo.IBCPortID, nil, res.Messages); err != nil {
if err := k.dispatchAll(ctx, contractAddr, contractInfo.IBCPortID, res.Submessages, res.Messages); err != nil {
return err
}
return nil
@@ -103,8 +102,7 @@ func (k Keeper) OnCloseChannel(
events := types.ParseEvents(res.Attributes, contractAddr)
ctx.EventManager().EmitEvents(events)
// TODO: add submessages support here (and everywhere else) once https://github.com/CosmWasm/cosmwasm/issues/822 is merged
if err := k.dispatchAll(ctx, contractAddr, contractInfo.IBCPortID, nil, res.Messages); err != nil {
if err := k.dispatchAll(ctx, contractAddr, contractInfo.IBCPortID, res.Submessages, res.Messages); err != nil {
return err
}
return nil
@@ -140,8 +138,7 @@ func (k Keeper) OnRecvPacket(
events := types.ParseEvents(res.Attributes, contractAddr)
ctx.EventManager().EmitEvents(events)
// TODO: add submessages support here (and everywhere else) once https://github.com/CosmWasm/cosmwasm/issues/822 is merged
if err := k.dispatchAll(ctx, contractAddr, contractInfo.IBCPortID, nil, res.Messages); err != nil {
if err := k.dispatchAll(ctx, contractAddr, contractInfo.IBCPortID, res.Submessages, res.Messages); err != nil {
return nil, err
}
return res.Acknowledgement, nil
@@ -178,8 +175,7 @@ func (k Keeper) OnAckPacket(
events := types.ParseEvents(res.Attributes, contractAddr)
ctx.EventManager().EmitEvents(events)
// TODO: add submessages support here (and everywhere else) once https://github.com/CosmWasm/cosmwasm/issues/822 is merged
if err := k.dispatchAll(ctx, contractAddr, contractInfo.IBCPortID, nil, res.Messages); err != nil {
if err := k.dispatchAll(ctx, contractAddr, contractInfo.IBCPortID, res.Submessages, res.Messages); err != nil {
return err
}
return nil
@@ -212,8 +208,7 @@ func (k Keeper) OnTimeoutPacket(
events := types.ParseEvents(res.Attributes, contractAddr)
ctx.EventManager().EmitEvents(events)
// TODO: add submessages support here (and everywhere else) once https://github.com/CosmWasm/cosmwasm/issues/822 is merged
if err := k.dispatchAll(ctx, contractAddr, contractInfo.IBCPortID, nil, res.Messages); err != nil {
if err := k.dispatchAll(ctx, contractAddr, contractInfo.IBCPortID, res.Submessages, res.Messages); err != nil {
return err
}
return nil