Implement and use ParseHTTPArgsWithLimit

types/rest/rest.go

@@ -221,9 +221,10 @@ func PostProcessResponse(w http.ResponseWriter, cdc *codec.Codec, response inter
 	_, _ = w.Write(output)
 }
 
-// ParseHTTPArgs parses the request's URL and returns a slice containing all arguments pairs.
-// It separates page and limit used for pagination
-func ParseHTTPArgs(r *http.Request) (tags []string, page, limit int, err error) {
+// ParseHTTPArgsWithLimit parses the request's URL and returns a slice containing
+// all arguments pairs. It separates page and limit used for pagination where a
+// default limit can be provided.
+func ParseHTTPArgsWithLimit(r *http.Request, defaultLimit int) (tags []string, page, limit int, err error) {
 	tags = make([]string, 0, len(r.Form))
 	for key, values := range r.Form {
 		if key == "page" || key == "limit" {
@@ -258,7 +259,7 @@ func ParseHTTPArgs(r *http.Request) (tags []string, page, limit int, err error)
 
 	limitStr := r.FormValue("limit")
 	if limitStr == "" {
-		limit = DefaultLimit
+		limit = defaultLimit
 	} else {
 		limit, err = strconv.Atoi(limitStr)
 		if err != nil {
@@ -270,3 +271,9 @@ func ParseHTTPArgs(r *http.Request) (tags []string, page, limit int, err error)
 
 	return tags, page, limit, nil
 }
+
+// ParseHTTPArgs parses the request's URL and returns a slice containing all
+// arguments pairs. It separates page and limit used for pagination.
+func ParseHTTPArgs(r *http.Request) (tags []string, page, limit int, err error) {
+	return ParseHTTPArgsWithLimit(r, DefaultLimit)
+}

x/slashing/client/rest/query.go

@@ -62,18 +62,12 @@ func signingInfoHandlerFn(cliCtx context.CLIContext, cdc *codec.Codec) http.Hand
 // http request handler to query signing info
 func signingInfoHandlerListFn(cliCtx context.CLIContext, cdc *codec.Codec) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		_, page, limit, err := rest.ParseHTTPArgs(r)
+		_, page, limit, err := rest.ParseHTTPArgsWithLimit(r, 0)
 		if err != nil {
 			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
 			return
 		}
 
-		// Override default limit if it wasn't provided as the querier will set
-		// it to the correct default limit.
-		if l := r.FormValue("limit"); l == "" {
-			limit = 0
-		}
-
 		params := slashing.NewQuerySigningInfosParams(page, limit)
 		bz, err := cdc.MarshalJSON(params)
 		if err != nil {

x/staking/client/rest/query.go

@@ -244,17 +244,12 @@ func delegatorValidatorHandlerFn(cliCtx context.CLIContext, cdc *codec.Codec) ht
 // HTTP request handler to query list of validators
 func validatorsHandlerFn(cliCtx context.CLIContext, cdc *codec.Codec) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		_, page, limit, err := rest.ParseHTTPArgs(r)
+		_, page, limit, err := rest.ParseHTTPArgsWithLimit(r, 0)
 		if err != nil {
 			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
 			return
 		}
 
-		// override default limit if it wasn't provided
-		if l := r.FormValue("limit"); l == "" {
-			limit = 0
-		}
-
 		status := r.FormValue("status")
 		if status == "" {
 			status = sdk.BondStatusBonded