diff --git a/modules/core/05-port/keeper/keeper.go b/modules/core/05-port/keeper/keeper.go index eceaed94184..41bce412efc 100644 --- a/modules/core/05-port/keeper/keeper.go +++ b/modules/core/05-port/keeper/keeper.go @@ -3,6 +3,7 @@ package keeper import ( "context" "strings" + "cosmossdk.io/log" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/modules/core/api/module.go b/modules/core/api/module.go index d90878d678f..33bca8c69fa 100644 --- a/modules/core/api/module.go +++ b/modules/core/api/module.go @@ -23,7 +23,13 @@ type IBCModule interface { signer sdk.AccAddress, ) error - // OnRecvPacket + OnRecvPacket( + ctx context.Context, + sourceID string, + destinationID string, + data channeltypesv2.PacketData, + relayer sdk.AccAddress, + ) channeltypesv2.RecvPacketResult // OnAcknowledgementPacket diff --git a/testing/mock/v2/ibc_app.go b/testing/mock/v2/ibc_app.go index 2e3598b5d96..b1892f551af 100644 --- a/testing/mock/v2/ibc_app.go +++ b/testing/mock/v2/ibc_app.go @@ -10,4 +10,5 @@ import ( type IBCApp struct { OnSendPacket func(ctx context.Context, sourceID string, destinationID string, sequence uint64, data channeltypesv2.PacketData, signer sdk.AccAddress) error + OnRecvPacket func(ctx context.Context, sourceID string, destinationID string, data channeltypesv2.PacketData, relayer sdk.AccAddress) channeltypesv2.RecvPacketResult } diff --git a/testing/mock/v2/ibc_module.go b/testing/mock/v2/ibc_module.go index 637d0381439..686d5e4498a 100644 --- a/testing/mock/v2/ibc_module.go +++ b/testing/mock/v2/ibc_module.go @@ -7,6 +7,7 @@ import ( channeltypesv2 "github.com/cosmos/ibc-go/v9/modules/core/04-channel/v2/types" "github.com/cosmos/ibc-go/v9/modules/core/api" + mockv1 "github.com/cosmos/ibc-go/v9/testing/mock" ) var _ api.IBCModule = (*IBCModule)(nil) @@ -38,12 +39,16 @@ func (im IBCModule) OnSendPacket(ctx context.Context, sourceID string, destinati return nil } -// func (im IBCModule) OnRecvPacket() error { -// if im.IBCApp.OnRecvPacket != nil { -// return im.IBCApp.OnRecvPacket(...) -// } -// return nil -// } +func (im IBCModule) OnRecvPacket(ctx context.Context, sourceID string, destinationID string, data channeltypesv2.PacketData, relayer sdk.AccAddress) channeltypesv2.RecvPacketResult { + if im.IBCApp.OnRecvPacket != nil { + return im.IBCApp.OnRecvPacket(ctx, sourceID, destinationID, data, relayer) + } + return channeltypesv2.RecvPacketResult{ + Status: channeltypesv2.PacketStatus_Success, + Acknowledgement: mockv1.MockPacketData, + } +} + // // func (im IBCModule) OnAcknowledgementPacket() error { // if im.IBCApp.OnAcknowledgementPacket != nil {