Fix rest and cli client for instance moduel

mesg-foundation · Feb 12, 2020 · 92ff3ac · 92ff3ac
1 parent e42ed83
commit 92ff3ac
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 10 deletions.
diff --git a/x/instance/client/cli/query.go b/x/instance/client/cli/query.go
@@ -37,9 +37,10 @@ func GetCmdGetInstance(queryRoute string, cdc *codec.Codec) *cobra.Command {
 	return &cobra.Command{
 		Use:   "get",
 		Short: "get",
+		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cliCtx := context.NewCLIContext().WithCodec(cdc)
-			res, _, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/%s", queryRoute, types.QueryGetInstance), nil)
+			res, _, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/%s/%s", queryRoute, types.QueryGetInstance, args[0]), nil)
 			if err != nil {
 				fmt.Printf("could not get instance\n%s\n", err.Error())
 				return nil

diff --git a/x/instance/client/rest/query.go b/x/instance/client/rest/query.go
@@ -12,27 +12,69 @@ import (
 
 func registerQueryRoutes(cliCtx context.CLIContext, r *mux.Router) {
 	r.HandleFunc(
-		"/ownership/get",
-		queryHandlerFn(cliCtx, types.QueryGetInstance),
+		"/instance/get/{hash}",
+		queryGetHandlerFn(cliCtx),
 	).Methods(http.MethodGet)
 	r.HandleFunc(
-		"/ownership/list",
-		queryHandlerFn(cliCtx, types.QueryListInstances),
+		"/instance/list",
+		queryListHandlerFn(cliCtx),
 	).Methods(http.MethodGet)
 	r.HandleFunc(
 		"/instance/parameters",
-		queryHandlerFn(cliCtx, types.QuerierRoute),
+		queryParametersHandlerFn(cliCtx),
 	).Methods("GET")
 }
 
-func queryHandlerFn(cliCtx context.CLIContext, path string) http.HandlerFunc {
+func queryGetHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		vars := mux.Vars(r)
+
+		cliCtx, ok := rest.ParseQueryHeightOrReturnBadRequest(w, cliCtx, r)
+		if !ok {
+			return
+		}
+
+		route := fmt.Sprintf("custom/%s/%s/%s", types.QuerierRoute, types.QueryGetInstance, vars["hash"])
+
+		res, height, err := cliCtx.QueryWithData(route, nil)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+
+		cliCtx = cliCtx.WithHeight(height)
+		rest.PostProcessResponse(w, cliCtx, res)
+	}
+}
+
+func queryListHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		cliCtx, ok := rest.ParseQueryHeightOrReturnBadRequest(w, cliCtx, r)
+		if !ok {
+			return
+		}
+
+		route := fmt.Sprintf("custom/%s/%s", types.QuerierRoute, types.QueryListInstances)
+
+		res, height, err := cliCtx.QueryWithData(route, nil)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+
+		cliCtx = cliCtx.WithHeight(height)
+		rest.PostProcessResponse(w, cliCtx, res)
+	}
+}
+
+func queryParametersHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		cliCtx, ok := rest.ParseQueryHeightOrReturnBadRequest(w, cliCtx, r)
 		if !ok {
 			return
 		}
 
-		route := fmt.Sprintf("custom/%s/%s", types.QuerierRoute, path)
+		route := fmt.Sprintf("custom/%s/parameters", types.QuerierRoute)
 
 		res, height, err := cliCtx.QueryWithData(route, nil)
 		if err != nil {

diff --git a/x/instance/internal/keeper/keeper.go b/x/instance/internal/keeper/keeper.go
@@ -74,12 +74,12 @@ func (k Keeper) List(ctx sdk.Context, f *api.ListInstanceRequest_Filter) ([]*ins
 	var items []*instance.Instance
 
 	for iter.Valid() {
-		var item *instance.Instance
+		var item instance.Instance
 		if err := k.cdc.UnmarshalBinaryLengthPrefixed(iter.Value(), &item); err != nil {
 			return nil, err
 		}
 		if f == nil || f.ServiceHash.IsZero() || item.ServiceHash.Equal(f.ServiceHash) {
-			items = append(items, item)
+			items = append(items, &item)
 		}
 		iter.Next()
 	}