R4R: generalize query response with height

.pending/improvements/sdk/4573-adds-height-in-

@@ -0,0 +1 @@
+#4573 adds height in response for validator endpoints

types/rest/rest.go

@@ -28,6 +28,13 @@ type GasEstimateResponse struct {
 	GasEstimate uint64 `json:"gas_estimate"`
 }
 
+// ResponseWithHeight wraps the embedded interface with the height it was queried
+// at.
+type ResponseWithHeight struct {
+	RespValue interface{} `json:"response"`
+	Height    int64       `json:"height"`
+}
+
 // BaseReq defines a structure that can be embedded in other request structures
 // that all share common "base" fields.
 type BaseReq struct {

x/auth/client/rest/query.go

@@ -14,13 +14,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 )
 
-// AccountWithHeight wraps the embedded Account with the height it was queried
-// at.
-type AccountWithHeight struct {
-	types.Account `json:"account"`
-	Height        int64 `json:"height"`
-}
-
 // query accountREST Handler
 func QueryAccountRequestHandlerFn(
 	storeName string, decoder types.AccountDecoder, cliCtx context.CLIContext,
@@ -60,7 +53,7 @@ func QueryAccountRequestHandlerFn(
 			return
 		}
 
-		rest.PostProcessResponse(w, cliCtx, AccountWithHeight{account, height})
+		rest.PostProcessResponse(w, cliCtx, rest.ResponseWithHeight{account, height})
 	}
 }
 

x/staking/client/rest/utils.go

@@ -128,11 +128,11 @@ func queryValidator(cliCtx context.CLIContext, endpoint string) http.HandlerFunc
 			return
 		}
 
-		res, _, err := cliCtx.QueryWithData(endpoint, bz)
+		res, height, err := cliCtx.QueryWithData(endpoint, bz)
 		if err != nil {
 			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
 			return
 		}
-		rest.PostProcessResponse(w, cliCtx, res)
+		rest.PostProcessResponse(w, cliCtx, rest.ResponseWithHeight{res, height})
 	}
 }