tests(mock, callbacks): moved mock PacketUnmarshaller logic to mock m…

…odule

modules/apps/29-fee/ibc_middleware_test.go

@@ -1095,8 +1095,8 @@ func (suite *FeeTestSuite) TestPacketInfoProviderInterface() {
 	suite.Require().True(ok)
 
 	packetData, err := feeModule.UnmarshalPacketData(ibcmock.MockPacketData)
-	suite.Require().NoError(err)
-	suite.Require().Equal(ibcmock.MockPacketData, packetData)
+	suite.Require().ErrorIs(err, ibcmock.ErrorMock)
+	suite.Require().Nil(packetData)
 
 	suite.Require().Equal(ibcmock.MockPacketSender, feeModule.GetPacketSender(channeltypes.Packet{}))
 	suite.Require().Equal(ibcmock.MockPacketReceiver, feeModule.GetPacketReceiver(channeltypes.Packet{}))

modules/apps/callbacks/types/callbacks_test.go

@@ -11,6 +11,7 @@ import (
 	transfer "github.com/cosmos/ibc-go/v7/modules/apps/transfer"
 	transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
 	ibctesting "github.com/cosmos/ibc-go/v7/testing"
+	ibcmock "github.com/cosmos/ibc-go/v7/testing/mock"
 )
 
 func (suite *CallbacksTypesTestSuite) TestGetSourceCallbackDataTransfer() {
@@ -304,7 +305,7 @@ func (suite *CallbacksTypesTestSuite) TestGetCallbackDataErrors() {
 	// the packet data can be unmarshaled but the resulting packet data cannot be
 	// casted to a CallbackPacketData.
 
-	packetUnmarshaler := MockPacketDataUnmarshaler{}
+	packetUnmarshaler := ibcmock.IBCModule{}
 
 	// "no unmarshaler error" instructs the MockPacketDataUnmarshaler to return nil nil
 	callbackData, hasEnoughGas, err := types.GetCallbackData(packetUnmarshaler, []byte("no unmarshaler error"), 100000, uint64(1_000_000), nil, nil)

modules/apps/callbacks/types/types_test.go

@@ -1,13 +1,10 @@
 package types_test
 
 import (
-	"fmt"
-	"reflect"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/cosmos/ibc-go/v7/modules/core/exported"
 	ibctesting "github.com/cosmos/ibc-go/v7/testing"
 )
 
@@ -29,20 +26,3 @@ func (suite *CallbacksTypesTestSuite) SetupSuite() {
 func TestCallbacksTypesTestSuite(t *testing.T) {
 	suite.Run(t, new(CallbacksTypesTestSuite))
 }
-
-type MockPacketDataUnmarshaler struct{}
-
-func (m MockPacketDataUnmarshaler) UnmarshalPacketData(data []byte) (interface{}, error) {
-	if reflect.DeepEqual(data, []byte("no unmarshaler error")) {
-		return nil, nil
-	}
-	return nil, fmt.Errorf("mock error")
-}
-
-func (m MockPacketDataUnmarshaler) GetPacketSender(packet exported.PacketI) string {
-	return ""
-}
-
-func (m MockPacketDataUnmarshaler) GetPacketReceiver(packet exported.PacketI) string {
-	return ""
-}

testing/mock/ibc_module.go

@@ -3,6 +3,7 @@ package mock
 import (
 	"bytes"
 	"fmt"
+	"reflect"
 	"strconv"
 	"strings"
 
@@ -171,7 +172,10 @@ func (im IBCModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet,
 // UnmarshalPacketData returns the MockPacketData. This function implements the optional
 // PacketInfoProvider interface required for ADR 008 support.
 func (im IBCModule) UnmarshalPacketData(bz []byte) (interface{}, error) {
-	return MockPacketData, nil
+	if reflect.DeepEqual(bz, []byte("no unmarshaler error")) {
+		return MockPacketData, nil
+	}
+	return nil, ErrorMock
 }
 
 // GetPacketSender returns MockPacketSender.

testing/mock/mock.go

@@ -35,6 +35,7 @@ const (
 var (
 	MockAcknowledgement             = channeltypes.NewResultAcknowledgement([]byte("mock acknowledgement"))
 	MockFailAcknowledgement         = channeltypes.NewErrorAcknowledgement(fmt.Errorf("mock failed acknowledgement"))
+	ErrorMock                       = fmt.Errorf("mock failed acknowledgement")
 	MockPacketData                  = []byte("mock packet data")
 	MockPacketSender                = "mock packet sender"
 	MockPacketReceiver              = "mock packet receiver"