fix: query handlers are ignoring accumulate flag

cosmos · Jan 9, 2025 · e84608f · e84608f
1 parent decc8ec
commit e84608f
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 5 deletions.
diff --git a/modules/core/02-client/keeper/grpc_query.go b/modules/core/02-client/keeper/grpc_query.go
@@ -94,8 +94,10 @@ func (q *queryServer) ClientStates(ctx context.Context, req *types.QueryClientSt
 			return false, err
 		}
 
-		identifiedClient := types.NewIdentifiedClientState(clientID, clientState)
-		clientStates = append(clientStates, identifiedClient)
+		if accumulate {
+			identifiedClient := types.NewIdentifiedClientState(clientID, clientState)
+			clientStates = append(clientStates, identifiedClient)
+		}
 		return true, nil
 	})
 	if err != nil {
@@ -184,7 +186,10 @@ func (q *queryServer) ConsensusStates(ctx context.Context, req *types.QueryConse
 			return false, err
 		}
 
-		consensusStates = append(consensusStates, types.NewConsensusStateWithHeight(height, consensusState))
+		if accumulate {
+			consensusStates = append(consensusStates, types.NewConsensusStateWithHeight(height, consensusState))
+		}
+
 		return true, nil
 	})
 	if err != nil {
@@ -221,7 +226,10 @@ func (q *queryServer) ConsensusStateHeights(ctx context.Context, req *types.Quer
 			return false, err
 		}
 
-		consensusStateHeights = append(consensusStateHeights, height)
+		if accumulate {
+			consensusStateHeights = append(consensusStateHeights, height)
+		}
+
 		return true, nil
 	})
 	if err != nil {

diff --git a/modules/core/02-client/keeper/grpc_query_test.go b/modules/core/02-client/keeper/grpc_query_test.go
@@ -116,13 +116,15 @@ func (suite *KeeperTestSuite) TestQueryClientStates() {
 		msg      string
 		malleate func()
 		expErr   error
+		expTotal int
 	}{
 		{
 			"req is nil",
 			func() {
 				req = nil
 			},
 			status.Error(codes.InvalidArgument, "empty request"),
+			0,
 		},
 		{
 			"empty pagination",
@@ -131,6 +133,7 @@ func (suite *KeeperTestSuite) TestQueryClientStates() {
 				req = &types.QueryClientStatesRequest{}
 			},
 			nil,
+			0,
 		},
 		{
 			"success",
@@ -157,6 +160,31 @@ func (suite *KeeperTestSuite) TestQueryClientStates() {
 				}
 			},
 			nil,
+			2,
+		},
+		{
+			"success request with pagination limit",
+			func() {
+				path1 := ibctesting.NewPath(suite.chainA, suite.chainB)
+				path1.SetupClients()
+
+				path2 := ibctesting.NewPath(suite.chainA, suite.chainB)
+				path2.SetupClients()
+
+				clientStateA1 := path1.EndpointA.GetClientState()
+
+				idcs := types.NewIdentifiedClientState(path1.EndpointA.ClientID, clientStateA1)
+
+				expClientStates = types.IdentifiedClientStates{idcs}.Sort()
+				req = &types.QueryClientStatesRequest{
+					Pagination: &query.PageRequest{
+						Limit:      1,
+						CountTotal: true,
+					},
+				}
+			},
+			nil,
+			2,
 		},
 	}
 
@@ -174,7 +202,8 @@ func (suite *KeeperTestSuite) TestQueryClientStates() {
 				suite.Require().NoError(err)
 				suite.Require().NotNil(res)
 				suite.Require().Equal(expClientStates.Sort(), res.ClientStates)
-				suite.Require().Equal(len(expClientStates), int(res.Pagination.Total))
+				suite.Require().Equal(tc.expTotal, int(res.Pagination.Total))
+
 			} else {
 				suite.Require().Error(err)
 				suite.Require().ErrorIs(err, tc.expErr)