Merge branch 'feat/ibc-eureka' into damian/7478-packet-receipt-query

modules/core/04-channel/v2/client/cli/query.go

@@ -19,7 +19,7 @@ func getCmdQueryChannel() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "channel [channel-id]",
 		Short:   "Query the information of a channel.",
-		Long:    "Query the channel information (creator and channel) for the provided channel ID.",
+		Long:    "Query the channel information for the provided channel ID.",
 		Example: fmt.Sprintf("%s query %s %s channel [channel-id]", version.AppName, exported.ModuleName, types.SubModuleName),
 		Args:    cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -39,6 +39,7 @@ func getCmdQueryChannel() *cobra.Command {
 			return clientCtx.PrintProto(res)
 		},
 	}
+
 	flags.AddQueryFlagsToCmd(cmd)
 
 	return cmd

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

@@ -37,17 +37,12 @@ func (q *queryServer) Channel(ctx context.Context, req *types.QueryChannelReques
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
-	creator, foundCreator := q.GetCreator(ctx, req.ChannelId)
-	channel, foundChannel := q.GetChannel(ctx, req.ChannelId)
-
-	if !foundCreator && !foundChannel {
-		return nil, status.Error(
-			codes.NotFound,
-			errorsmod.Wrapf(types.ErrChannelNotFound, "channel-id: %s", req.ChannelId).Error(),
-		)
+	channel, found := q.GetChannel(ctx, req.ChannelId)
+	if !found {
+		return nil, status.Error(codes.NotFound, errorsmod.Wrapf(types.ErrChannelNotFound, "channel-id: %s", req.ChannelId).Error())
 	}
 
-	return types.NewQueryChannelResponse(creator, channel), nil
+	return types.NewQueryChannelResponse(channel), nil
 }
 
 // PacketCommitment implements the Query/PacketCommitment gRPC method.

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

@@ -15,7 +15,6 @@ import (
 func (suite *KeeperTestSuite) TestQueryChannel() {
 	var (
 		req        *types.QueryChannelRequest
-		expCreator string
 		expChannel types.Channel
 	)
 
@@ -28,7 +27,6 @@ func (suite *KeeperTestSuite) TestQueryChannel() {
 			"success",
 			func() {
 				ctx := suite.chainA.GetContext()
-				suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.SetCreator(ctx, ibctesting.FirstChannelID, expCreator)
 				suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.SetChannel(ctx, ibctesting.FirstChannelID, expChannel)
 
 				req = &types.QueryChannelRequest{
@@ -38,54 +36,28 @@ func (suite *KeeperTestSuite) TestQueryChannel() {
 			nil,
 		},
 		{
-			"success: no creator",
-			func() {
-				expCreator = ""
-
-				suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.SetChannel(suite.chainA.GetContext(), ibctesting.FirstChannelID, expChannel)
-
-				req = &types.QueryChannelRequest{
-					ChannelId: ibctesting.FirstChannelID,
-				}
-			},
-			nil,
-		},
-		{
-			"success: no channel",
+			"req is nil",
 			func() {
-				expChannel = types.Channel{}
-
-				suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.SetCreator(suite.chainA.GetContext(), ibctesting.FirstChannelID, expCreator)
-
-				req = &types.QueryChannelRequest{
-					ChannelId: ibctesting.FirstChannelID,
-				}
+				req = nil
 			},
-			nil,
+			status.Error(codes.InvalidArgument, "empty request"),
 		},
 		{
-			"req is nil",
+			"invalid channelID",
 			func() {
-				req = nil
+				req = &types.QueryChannelRequest{}
 			},
-			status.Error(codes.InvalidArgument, "empty request"),
+			status.Error(codes.InvalidArgument, "identifier cannot be blank: invalid identifier"),
 		},
 		{
-			"no creator and no channel",
+			"channel not found",
 			func() {
 				req = &types.QueryChannelRequest{
 					ChannelId: ibctesting.FirstChannelID,
 				}
 			},
 			status.Error(codes.NotFound, fmt.Sprintf("channel-id: %s: channel not found", ibctesting.FirstChannelID)),
 		},
-		{
-			"invalid channelID",
-			func() {
-				req = &types.QueryChannelRequest{}
-			},
-			status.Error(codes.InvalidArgument, "identifier cannot be blank: invalid identifier"),
-		},
 	}
 
 	for _, tc := range testCases {
@@ -94,7 +66,6 @@ func (suite *KeeperTestSuite) TestQueryChannel() {
 		suite.Run(fmt.Sprintf("Case %s", tc.msg), func() {
 			suite.SetupTest() // reset
 
-			expCreator = ibctesting.TestAccAddress
 			merklePathPrefix := commitmenttypes.NewMerklePath([]byte("prefix"))
 			expChannel = types.Channel{ClientId: ibctesting.SecondClientID, CounterpartyChannelId: ibctesting.SecondChannelID, MerklePathPrefix: merklePathPrefix}
 
@@ -107,7 +78,6 @@ func (suite *KeeperTestSuite) TestQueryChannel() {
 			if expPass {
 				suite.Require().NoError(err)
 				suite.Require().NotNil(res)
-				suite.Require().Equal(expCreator, res.Creator)
 				suite.Require().Equal(expChannel, res.Channel)
 			} else {
 				suite.Require().ErrorIs(err, tc.expError)

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

@@ -10,9 +10,8 @@ func NewQueryChannelRequest(channelID string) *QueryChannelRequest {
 }
 
 // NewQueryChannelResponse creates and returns a new channel query response.
-func NewQueryChannelResponse(creator string, channel Channel) *QueryChannelResponse {
+func NewQueryChannelResponse(channel Channel) *QueryChannelResponse {
 	return &QueryChannelResponse{
-		Creator: creator,
 		Channel: channel,
 	}
 }

proto/ibc/core/channel/v2/query.proto

@@ -39,8 +39,8 @@ message QueryChannelRequest {
 
 // QueryChannelRequest is the response type for the Query/Channel RPC method
 message QueryChannelResponse {
-  string  creator = 1;
-  Channel channel = 2 [(gogoproto.nullable) = false];
+  // the channel associated with the provided channel id
+  Channel channel = 1 [(gogoproto.nullable) = false];
 }
 
 // QueryPacketCommitmentRequest is the request type for the Query/PacketCommitment RPC method.