testing

modules/core/04-channel/v2/keeper/msg_server_test.go

@@ -294,11 +294,13 @@ func (suite *KeeperTestSuite) TestMsgAcknowledgement() {
 	testCases := []struct {
 		name     string
 		malleate func()
+		payload  types.Payload
 		expError error
 	}{
 		{
 			name:     "success",
 			malleate: func() {},
+			payload:  mockv2.NewMockPayload(mockv2.ModuleNameA, mockv2.ModuleNameB),
 		},
 		{
 			name: "success: NoOp",
@@ -311,6 +313,15 @@ func (suite *KeeperTestSuite) TestMsgAcknowledgement() {
 					return mock.MockApplicationCallbackError
 				}
 			},
+			payload: mockv2.NewMockPayload(mockv2.ModuleNameA, mockv2.ModuleNameB),
+		},
+		{
+			name: "success: failed receive",
+			malleate: func() {
+				// relayer can pass in an empty acknowledgement on failure
+				ack = types.Acknowledgement{}
+			},
+			payload: mockv2.NewErrorMockPayload(mockv2.ModuleNameA, mockv2.ModuleNameB),
 		},
 		{
 			name: "failure: callback fails",
@@ -319,6 +330,7 @@ func (suite *KeeperTestSuite) TestMsgAcknowledgement() {
 					return mock.MockApplicationCallbackError
 				}
 			},
+			payload:  mockv2.NewMockPayload(mockv2.ModuleNameA, mockv2.ModuleNameB),
 			expError: mock.MockApplicationCallbackError,
 		},
 		{
@@ -327,20 +339,23 @@ func (suite *KeeperTestSuite) TestMsgAcknowledgement() {
 				// change the source id to a non-existent channel.
 				packet.SourceClient = "not-existent-channel"
 			},
+			payload:  mockv2.NewMockPayload(mockv2.ModuleNameA, mockv2.ModuleNameB),
 			expError: clienttypes.ErrCounterpartyNotFound,
 		},
 		{
 			name: "failure: invalid commitment",
 			malleate: func() {
 				suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.SetPacketCommitment(suite.chainA.GetContext(), packet.SourceClient, packet.Sequence, []byte("foo"))
 			},
+			payload:  mockv2.NewMockPayload(mockv2.ModuleNameA, mockv2.ModuleNameB),
 			expError: types.ErrInvalidPacket,
 		},
 		{
 			name: "failure: failed membership verification",
 			malleate: func() {
 				ack.AppAcknowledgements[0] = mock.MockFailPacketData
 			},
+			payload:  mockv2.NewMockPayload(mockv2.ModuleNameA, mockv2.ModuleNameB),
 			expError: errors.New("failed packet acknowledgement verification"),
 		},
 	}
@@ -355,7 +370,7 @@ func (suite *KeeperTestSuite) TestMsgAcknowledgement() {
 
 			var err error
 			// Send packet from A to B
-			packet, err = path.EndpointA.MsgSendPacket(timeoutTimestamp, mockv2.NewMockPayload(mockv2.ModuleNameA, mockv2.ModuleNameB))
+			packet, err = path.EndpointA.MsgSendPacket(timeoutTimestamp, tc.payload)
 			suite.Require().NoError(err)
 
 			err = path.EndpointB.MsgRecvPacket(packet)

modules/core/04-channel/v2/types/msgs.go

@@ -113,11 +113,9 @@ func (msg *MsgAcknowledgement) ValidateBasic() error {
 		return errorsmod.Wrapf(ibcerrors.ErrInvalidAddress, "string could not be parsed as address: %v", err)
 	}
 
-	if err := msg.Packet.ValidateBasic(); err != nil {
-		return err
-	}
-
-	return msg.Acknowledgement.ValidateBasic()
+	// NOTE: Acknowledgement is allowed to be empty if the receive failed
+	// so we will check in the acknowledgement handler
+	return msg.Packet.ValidateBasic()
 }
 
 // NewMsgTimeout creates a new MsgTimeout instance

modules/core/04-channel/v2/types/msgs_test.go

@@ -210,13 +210,6 @@ func (s *TypesTestSuite) TestMsgAcknowledge_ValidateBasic() {
 			},
 			expError: types.ErrInvalidPacket,
 		},
-		{
-			name: "failure: invalid acknowledgement",
-			malleate: func() {
-				msg.Acknowledgement = types.NewAcknowledgement(true, []byte(""))
-			},
-			expError: types.ErrInvalidAcknowledgement,
-		},
 	}
 	for _, tc := range testCases {
 		s.Run(tc.name, func() {

testing/mock/v2/ibc_module.go

@@ -1,12 +1,14 @@
 package mock
 
 import (
+	"bytes"
 	"context"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	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)
@@ -42,11 +44,15 @@ func (im IBCModule) OnSendPacket(ctx context.Context, sourceChannel string, dest
 	return nil
 }
 
-func (im IBCModule) OnRecvPacket(ctx context.Context, sourceChannel string, destinationChannel string, sequence uint64, data channeltypesv2.Payload, relayer sdk.AccAddress) channeltypesv2.RecvPacketResult {
+func (im IBCModule) OnRecvPacket(ctx context.Context, sourceChannel string, destinationChannel string, sequence uint64, payload channeltypesv2.Payload, relayer sdk.AccAddress) channeltypesv2.RecvPacketResult {
 	if im.IBCApp.OnRecvPacket != nil {
-		return im.IBCApp.OnRecvPacket(ctx, sourceChannel, destinationChannel, sequence, data, relayer)
+		return im.IBCApp.OnRecvPacket(ctx, sourceChannel, destinationChannel, sequence, payload, relayer)
+	}
+	if bytes.Equal(mockv1.MockPacketData, payload.Value) {
+		return MockRecvPacketResult
+	} else {
+		return MockFailRecvPacketResult
 	}
-	return MockRecvPacketResult
 }
 
 func (im IBCModule) OnAcknowledgementPacket(ctx context.Context, sourceChannel string, destinationChannel string, sequence uint64, recvSuccess bool, acknowledgement []byte, payload channeltypesv2.Payload, relayer sdk.AccAddress) error {

testing/mock/v2/mock.go

@@ -16,7 +16,7 @@ var (
 		Acknowledgement: mockv1.MockAcknowledgement.Acknowledgement(),
 	}
 	MockFailRecvPacketResult = channeltypesv2.RecvPacketResult{
-		Status:          channeltypesv2.PacketStatus_Success,
+		Status:          channeltypesv2.PacketStatus_Failure,
 		Acknowledgement: mockv1.MockFailAcknowledgement.Acknowledgement(),
 	}
 )
@@ -30,3 +30,13 @@ func NewMockPayload(sourcePort, destPort string) channeltypesv2.Payload {
 		Version:         mockv1.Version,
 	}
 }
+
+func NewErrorMockPayload(sourcePort, destPort string) channeltypesv2.Payload {
+	return channeltypesv2.Payload{
+		SourcePort:      sourcePort,
+		DestinationPort: destPort,
+		Encoding:        transfertypes.EncodingProtobuf,
+		Value:           mockv1.MockFailPacketData,
+		Version:         mockv1.Version,
+	}
+}