nit(transfer): Mark hops as non nullable. (#6566)

* nit(transfer): Mark hops as non nullable. * lint: fix additional linting issues
cosmos · Jun 12, 2024 · 413b7c1 · 413b7c1
1 parent 0c9f368
commit 413b7c1
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 33 deletions.
diff --git a/modules/apps/transfer/keeper/relay_forwarding_test.go b/modules/apps/transfer/keeper/relay_forwarding_test.go
@@ -28,7 +28,7 @@ func (suite *KeeperTestSuite) TestPathForwarding() {
 	sender := suite.chainA.SenderAccounts[0].SenderAccount
 	receiver := suite.chainA.SenderAccounts[1].SenderAccount
 	forwardingPath := types.ForwardingInfo{
-		Hops: []*types.Hop{
+		Hops: []types.Hop{
 			{
 				PortId:    path2.EndpointA.ChannelConfig.PortID,
 				ChannelId: path2.EndpointA.ChannelID,
@@ -90,7 +90,7 @@ func (suite *KeeperTestSuite) TestEscrowsAreSetAfterForwarding() {
 	sender := suite.chainA.SenderAccounts[0].SenderAccount
 	receiver := suite.chainA.SenderAccounts[1].SenderAccount
 	forwardingPath := types.ForwardingInfo{
-		Hops: []*types.Hop{
+		Hops: []types.Hop{
 			{
 				PortId:    path2.EndpointB.ChannelConfig.PortID,
 				ChannelId: path2.EndpointB.ChannelID,
@@ -173,7 +173,7 @@ func (suite *KeeperTestSuite) TestHappyPathForwarding() {
 	sender := suite.chainA.SenderAccounts[0].SenderAccount
 	receiver := suite.chainA.SenderAccounts[1].SenderAccount
 	forwardingPath := types.ForwardingInfo{
-		Hops: []*types.Hop{
+		Hops: []types.Hop{
 			{
 				PortId:    path2.EndpointB.ChannelConfig.PortID,
 				ChannelId: path2.EndpointB.ChannelID,
@@ -281,7 +281,7 @@ func (suite *KeeperTestSuite) TestSimplifiedHappyPathForwarding() {
 	sender := suite.chainA.SenderAccounts[0].SenderAccount
 	receiver := suite.chainA.SenderAccounts[1].SenderAccount
 	forwardingPath := types.ForwardingInfo{
-		Hops: []*types.Hop{
+		Hops: []types.Hop{
 			{
 				PortId:    path2.EndpointB.ChannelConfig.PortID,
 				ChannelId: path2.EndpointB.ChannelID,
@@ -478,7 +478,7 @@ func (suite *KeeperTestSuite) TestAcknowledgementFailureScenario5Forwarding() {
 	receiver = suite.chainA.SenderAccounts[0].SenderAccount // Receiver is the A chain account
 
 	forwardingPath := types.ForwardingInfo{
-		Hops: []*types.Hop{
+		Hops: []types.Hop{
 			{
 				PortId:    path1.EndpointB.ChannelConfig.PortID,
 				ChannelId: path1.EndpointB.ChannelID,

diff --git a/modules/apps/transfer/types/packet_test.go b/modules/apps/transfer/types/packet_test.go
@@ -234,7 +234,7 @@ func TestFungibleTokenPacketDataV2ValidateBasic(t *testing.T) {
 				receiver,
 				"",
 				&types.ForwardingInfo{
-					Hops: []*types.Hop{
+					Hops: []types.Hop{
 						{
 							PortId:    "transfer",
 							ChannelId: "channel-1",
@@ -400,7 +400,7 @@ func TestFungibleTokenPacketDataV2ValidateBasic(t *testing.T) {
 				receiver,
 				"memo",
 				&types.ForwardingInfo{
-					Hops: []*types.Hop{
+					Hops: []types.Hop{
 						{
 							PortId:    "transfer",
 							ChannelId: "channel-1",

diff --git a/modules/apps/transfer/types/transfer.pb.go b/modules/apps/transfer/types/transfer.pb.go
diff --git a/proto/ibc/applications/transfer/v1/transfer.proto b/proto/ibc/applications/transfer/v1/transfer.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package ibc.applications.transfer.v1;
 
+import "gogoproto/gogo.proto";
+
 option go_package = "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types";
 
 // Params defines the set of IBC transfer parameters.
@@ -21,7 +23,7 @@ message Params {
 // through which a packet must be forwarded, and the memo string to be used in the
 // final destination of the tokens.
 message ForwardingInfo {
-  repeated Hop hops = 1;
+  repeated Hop hops = 1 [(gogoproto.nullable) = false];
   string       memo = 2;
 }
 
@@ -30,4 +32,4 @@ message ForwardingInfo {
 message Hop {
   string port_id    = 1;
   string channel_id = 2;
-}
+}