fix: update Paginate to use FilterPaginate in ClientStates and ConnectionChannels grpc queries

modules/core/02-client/keeper/grpc_query.go

@@ -63,25 +63,26 @@ func (q Keeper) ClientStates(c context.Context, req *types.QueryClientStatesRequ
 	clientStates := types.IdentifiedClientStates{}
 	store := prefix.NewStore(ctx.KVStore(q.storeKey), host.KeyClientStorePrefix)
 
-	pageRes, err := query.Paginate(store, req.Pagination, func(key, value []byte) error {
+	pageRes, err := query.FilteredPaginate(store, req.Pagination, func(key, value []byte, accumulate bool) (bool, error) {
+		// filter any metadata stored under client state key
 		keySplit := strings.Split(string(key), "/")
 		if keySplit[len(keySplit)-1] != "clientState" {
-			return nil
+			return false, nil
 		}
 
 		clientState, err := q.UnmarshalClientState(value)
 		if err != nil {
-			return err
+			return false, err
 		}
 
 		clientID := keySplit[1]
 		if err := host.ClientIdentifierValidator(clientID); err != nil {
-			return err
+			return false, err
 		}
 
 		identifiedClient := types.NewIdentifiedClientState(clientID, clientState)
 		clientStates = append(clientStates, identifiedClient)
-		return nil
+		return true, nil
 	})
 	if err != nil {
 		return nil, err

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

@@ -96,26 +96,27 @@ func (q Keeper) ConnectionChannels(c context.Context, req *types.QueryConnection
 	channels := []*types.IdentifiedChannel{}
 	store := prefix.NewStore(ctx.KVStore(q.storeKey), []byte(host.KeyChannelEndPrefix))
 
-	pageRes, err := query.Paginate(store, req.Pagination, func(key, value []byte) error {
+	pageRes, err := query.FilteredPaginate(store, req.Pagination, func(key, value []byte, accumulate bool) (bool, error) {
+		// filter any metadata stored under channel key
 		var result types.Channel
 		if err := q.cdc.Unmarshal(value, &result); err != nil {
-			return err
+			return false, err
 		}
 
 		// ignore channel and continue to the next item if the connection is
 		// different than the requested one
 		if result.ConnectionHops[0] != req.Connection {
-			return nil
+			return false, nil
 		}
 
 		portID, channelID, err := host.ParseChannelPath(string(key))
 		if err != nil {
-			return err
+			return false, err
 		}
 
 		identifiedChannel := types.NewIdentifiedChannel(portID, channelID, result)
 		channels = append(channels, &identifiedChannel)
-		return nil
+		return true, nil
 	})
 	if err != nil {
 		return nil, err