test: add remaining unit tests for transfer and ica

modules/apps/27-interchain-accounts/types/codec.go

@@ -24,7 +24,7 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
 	registry.RegisterImplementations((*authtypes.GenesisAccount)(nil), &InterchainAccount{})
 
 	registry.RegisterImplementations(
-		(*exported.CallbackPacketDataI)(nil),
+		(*exported.CallbackPacketData)(nil),
 		&InterchainAccountPacketData{},
 	)
 }

modules/apps/27-interchain-accounts/types/packet.go

@@ -106,6 +106,7 @@ func (iapd InterchainAccountPacketData) GetSourceCallbackAddress() string {
 	if !ok {
 		return ""
 	}
+
 	return callbackAddr
 }
 

modules/apps/27-interchain-accounts/types/packet_test.go

@@ -1,6 +1,8 @@
 package types_test
 
 import (
+	"fmt"
+
 	"github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types"
 )
 
@@ -83,11 +85,13 @@ func (suite *TypesTestSuite) TestValidateBasic() {
 	}
 }
 
-func (suite *TypesTestSuite) TestGetCallbackAddresses() {
+func (suite *TypesTestSuite) TestGetSourceCallbackAddress() {
+	expSrcCbAddr := "srcCbAddr"
+
 	testCases := []struct {
-		name               string
-		packetData         types.InterchainAccountPacketData
-		expSrcCallbackAddr string
+		name       string
+		packetData types.InterchainAccountPacketData
+		expPass    bool
 	}{
 		{
 			"memo is empty",
@@ -96,7 +100,7 @@ func (suite *TypesTestSuite) TestGetCallbackAddresses() {
 				Data: []byte("data"),
 				Memo: "",
 			},
-			"",
+			false,
 		},
 		{
 			"memo is not json string",
@@ -105,7 +109,7 @@ func (suite *TypesTestSuite) TestGetCallbackAddresses() {
 				Data: []byte("data"),
 				Memo: "memo",
 			},
-			"",
+			false,
 		},
 		{
 			"memo is does not have callbacks in json struct",
@@ -114,7 +118,7 @@ func (suite *TypesTestSuite) TestGetCallbackAddresses() {
 				Data: []byte("data"),
 				Memo: "{\"Key\": 10}",
 			},
-			"",
+			false,
 		},
 		{
 			"memo has callbacks in json struct but does not have src_callback_address key",
@@ -123,7 +127,7 @@ func (suite *TypesTestSuite) TestGetCallbackAddresses() {
 				Data: []byte("data"),
 				Memo: "{\"callbacks\": {\"Key\": 10}}",
 			},
-			"",
+			false,
 		},
 		{
 			"memo has callbacks in json struct but does not have string value for src_callback_address key",
@@ -132,21 +136,71 @@ func (suite *TypesTestSuite) TestGetCallbackAddresses() {
 				Data: []byte("data"),
 				Memo: "{\"callbacks\": {\"src_callback_address\": 10}}",
 			},
-			"",
+			false,
 		},
 		{
-			"memo has callbacks in json struct but does not have string value for src_callback_address key",
+			"memo has callbacks in json struct and properly formatted src_callback_address",
+			types.InterchainAccountPacketData{
+				Type: types.EXECUTE_TX,
+				Data: []byte("data"),
+				Memo: fmt.Sprintf("{\"callbacks\": {\"src_callback_address\": \"%s\"}}", expSrcCbAddr),
+			},
+			true,
+		},
+	}
+
+	for _, tc := range testCases {
+		tc := tc
+		suite.Run(tc.name, func() {
+			srcCbAddr := tc.packetData.GetSourceCallbackAddress()
+
+			if tc.expPass {
+				suite.Require().Equal(expSrcCbAddr, srcCbAddr)
+			} else {
+				suite.Require().Equal("", srcCbAddr)
+			}
+		})
+	}
+}
+
+func (suite *TypesTestSuite) TestGetDestCallbackAddress() {
+	testCases := []struct {
+		name       string
+		packetData types.InterchainAccountPacketData
+	}{
+		{
+			"memo is empty",
 			types.InterchainAccountPacketData{
 				Type: types.EXECUTE_TX,
 				Data: []byte("data"),
-				Memo: "{\"callbacks\": {\"src_callback_address\": \"testAddress\"}}",
+				Memo: "",
+			},
+		},
+		{
+			"memo has dest callback address specified in json struct",
+			types.InterchainAccountPacketData{
+				Type: types.EXECUTE_TX,
+				Data: []byte("data"),
+				Memo: "{\"callbacks\": {\"dest_callback_address\": \"testAddress\"}}",
 			},
-			"testAddress",
 		},
 	}
 
 	for _, tc := range testCases {
-		srcCbAddr := tc.packetData.GetSrcCallbackAddress()
-		suite.Require().Equal(tc.expSrcCallbackAddr, srcCbAddr, "%s testcase does not have expected src_callback_address", tc.name)
+		tc := tc
+		suite.Run(tc.name, func() {
+			destCbAddr := tc.packetData.GetDestCallbackAddress()
+			suite.Require().Equal("", destCbAddr)
+		})
+	}
+}
+
+func (suite *TypesTestSuite) TestUserDefinedGasLimit() {
+	packetData := types.InterchainAccountPacketData{
+		Type: types.EXECUTE_TX,
+		Data: []byte("data"),
+		Memo: "{\"callbacks\": {\"user_defined_gas_limit\": 100}}",
 	}
+
+	suite.Require().Equal(uint64(0), packetData.UserDefinedGasLimit(), "user defined gas limit does not return 0")
 }

modules/apps/transfer/types/codec.go

@@ -31,7 +31,7 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
 	)
 
 	registry.RegisterImplementations(
-		(*exported.CallbackPacketDataI)(nil),
+		(*exported.CallbackPacketData)(nil),
 		&FungibleTokenPacketData{},
 	)
 

modules/apps/transfer/types/packet_test.go

@@ -1,6 +1,7 @@
 package types_test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -43,3 +44,213 @@ func TestFungibleTokenPacketDataValidateBasic(t *testing.T) {
 		}
 	}
 }
+
+func (suite *TypesTestSuite) TestGetSourceCallbackAddress() {
+	testCases := []struct {
+		name       string
+		packetData types.FungibleTokenPacketData
+		expPass    bool
+	}{
+		{
+			"memo is empty",
+			types.FungibleTokenPacketData{
+				Denom:    denom,
+				Amount:   amount,
+				Sender:   addr1,
+				Receiver: addr2,
+				Memo:     "",
+			},
+			false,
+		},
+		{
+			"memo is not json string",
+			types.FungibleTokenPacketData{
+				Denom:    denom,
+				Amount:   amount,
+				Sender:   addr1,
+				Receiver: addr2,
+				Memo:     "memo",
+			},
+			false,
+		},
+		{
+			"memo is does not have callbacks in json struct",
+			types.FungibleTokenPacketData{
+				Denom:    denom,
+				Amount:   amount,
+				Sender:   addr1,
+				Receiver: addr2,
+				Memo:     "{\"Key\": 10}",
+			},
+			false,
+		},
+		{
+			"memo has callbacks in json struct but does not have src_callback_address key",
+			types.FungibleTokenPacketData{
+				Denom:    denom,
+				Amount:   amount,
+				Sender:   addr1,
+				Receiver: addr2,
+				Memo:     "{\"callbacks\": {\"Key\": 10}}",
+			},
+			false,
+		},
+		{
+			"memo has callbacks in json struct but does not have string value for src_callback_address key",
+			types.FungibleTokenPacketData{
+				Denom:    denom,
+				Amount:   amount,
+				Sender:   addr1,
+				Receiver: addr2,
+				Memo:     "{\"callbacks\": {\"src_callback_address\": 10}}",
+			},
+			false,
+		},
+		{
+			"memo has callbacks in json struct and properly formatted src_callback_address which does not match packet sender",
+			types.FungibleTokenPacketData{
+				Denom:    denom,
+				Amount:   amount,
+				Sender:   addr1,
+				Receiver: addr2,
+				Memo:     "{\"callbacks\": {\"src_callback_address\": \"testAddress\"}}",
+			},
+			false,
+		},
+		{
+			"valid src_callback_address specified in memo that matches sender",
+			types.FungibleTokenPacketData{
+				Denom:    denom,
+				Amount:   amount,
+				Sender:   addr1,
+				Receiver: addr2,
+				Memo:     fmt.Sprintf("{\"callbacks\": {\"src_callback_address\": \"%s\"}}", addr1),
+			},
+			true,
+		},
+	}
+
+	for _, tc := range testCases {
+		tc := tc
+		suite.Run(tc.name, func() {
+			srcCbAddr := tc.packetData.GetSourceCallbackAddress()
+
+			if tc.expPass {
+				suite.Require().Equal(addr1, srcCbAddr)
+			} else {
+				suite.Require().Equal("", srcCbAddr)
+			}
+		})
+	}
+}
+
+func (suite *TypesTestSuite) TestGetDestCallbackAddress() {
+	testCases := []struct {
+		name       string
+		packetData types.FungibleTokenPacketData
+		expPass    bool
+	}{
+		{
+			"memo is empty",
+			types.FungibleTokenPacketData{
+				Denom:    denom,
+				Amount:   amount,
+				Sender:   addr1,
+				Receiver: addr2,
+				Memo:     "",
+			},
+			false,
+		},
+		{
+			"memo is not json string",
+			types.FungibleTokenPacketData{
+				Denom:    denom,
+				Amount:   amount,
+				Sender:   addr1,
+				Receiver: addr2,
+				Memo:     "memo",
+			},
+			false,
+		},
+		{
+			"memo is does not have callbacks in json struct",
+			types.FungibleTokenPacketData{
+				Denom:    denom,
+				Amount:   amount,
+				Sender:   addr1,
+				Receiver: addr2,
+				Memo:     "{\"Key\": 10}",
+			},
+			false,
+		},
+		{
+			"memo has callbacks in json struct but does not have dest_callback_address key",
+			types.FungibleTokenPacketData{
+				Denom:    denom,
+				Amount:   amount,
+				Sender:   addr1,
+				Receiver: addr2,
+				Memo:     "{\"callbacks\": {\"Key\": 10}}",
+			},
+			false,
+		},
+		{
+			"memo has callbacks in json struct but does not have string value for dest_callback_address key",
+			types.FungibleTokenPacketData{
+				Denom:    denom,
+				Amount:   amount,
+				Sender:   addr1,
+				Receiver: addr2,
+				Memo:     "{\"callbacks\": {\"dest_callback_address\": 10}}",
+			},
+			false,
+		},
+		{
+			"memo has callbacks in json struct and properly formatted dest_callback_address which does not match packet sender",
+			types.FungibleTokenPacketData{
+				Denom:    denom,
+				Amount:   amount,
+				Sender:   addr1,
+				Receiver: addr2,
+				Memo:     "{\"callbacks\": {\"dest_callback_address\": \"testAddress\"}}",
+			},
+			false,
+		},
+		{
+			"valid dest_callback_address specified in memo that matches sender",
+			types.FungibleTokenPacketData{
+				Denom:    denom,
+				Amount:   amount,
+				Sender:   addr1,
+				Receiver: addr2,
+				Memo:     fmt.Sprintf("{\"callbacks\": {\"dest_callback_address\": \"%s\"}}", addr2),
+			},
+			true,
+		},
+	}
+
+	for _, tc := range testCases {
+		tc := tc
+		suite.Run(tc.name, func() {
+			destCbAddr := tc.packetData.GetDestCallbackAddress()
+
+			if tc.expPass {
+				suite.Require().Equal(addr2, destCbAddr)
+			} else {
+				suite.Require().Equal("", destCbAddr)
+			}
+		})
+	}
+}
+
+func (suite *TypesTestSuite) TestUserDefinedGasLimit() {
+	packetData := types.FungibleTokenPacketData{
+		Denom:    denom,
+		Amount:   amount,
+		Sender:   addr1,
+		Receiver: addr2,
+		Memo:     "{\"callbacks\": {\"user_defined_gas_limit\": 100}}",
+	}
+
+	suite.Require().Equal(uint64(0), packetData.UserDefinedGasLimit(), "user defined gas limit does not return 0")
+}

modules/core/exported/codec.go

@@ -7,7 +7,7 @@ import (
 // RegisterInterfaces registers the CallbackPacketDataI interface.
 func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
 	registry.RegisterInterface(
-		"ibc.core.exported.v1.CallbackPacketDataI",
-		(*CallbackPacketDataI)(nil),
+		"ibc.core.exported.v1.CallbackPacketData",
+		(*CallbackPacketData)(nil),
 	)
 }