From c556bd8c6c36a4337fc2e8f28171abc17de16282 Mon Sep 17 00:00:00 2001 From: Kevin Davis Date: Thu, 21 May 2020 00:49:42 -0400 Subject: [PATCH] fix: remove vesting client (#516) --- x/validator-vesting/client/cli/query.go | 72 ---------------- x/validator-vesting/client/rest/query.go | 105 ----------------------- x/validator-vesting/client/rest/rest.go | 13 --- x/validator-vesting/module.go | 8 +- 4 files changed, 2 insertions(+), 196 deletions(-) delete mode 100644 x/validator-vesting/client/cli/query.go delete mode 100644 x/validator-vesting/client/rest/query.go delete mode 100644 x/validator-vesting/client/rest/rest.go diff --git a/x/validator-vesting/client/cli/query.go b/x/validator-vesting/client/cli/query.go deleted file mode 100644 index b4d45251..00000000 --- a/x/validator-vesting/client/cli/query.go +++ /dev/null @@ -1,72 +0,0 @@ -package cli - -import ( - "fmt" - - "github.com/spf13/cobra" - - "github.com/kava-labs/kava/x/validator-vesting/types" - - "github.com/cosmos/cosmos-sdk/client/context" - "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/cosmos/cosmos-sdk/codec" -) - -// GetQueryCmd returns the cli query commands for this module -func GetQueryCmd(queryRoute string, cdc *codec.Codec) *cobra.Command { - // Group nameservice queries under a subcommand - queryValidatorVestingCmd := &cobra.Command{ - Use: "validator-vesting", - Short: "Querying commands for the validator vesting module", - } - - queryValidatorVestingCmd.AddCommand(flags.GetCommands( - QueryCirculatingSupplyCmd(queryRoute, cdc), - QueryTotalSupplyCmd(queryRoute, cdc), - )...) - return queryValidatorVestingCmd -} - -// QueryCirculatingSupplyCmd queries the total circulating supply -func QueryCirculatingSupplyCmd(queryRoute string, cdc *codec.Codec) *cobra.Command { - return &cobra.Command{ - Use: "circulating-supply", - Short: "Query circulating supply information", - - RunE: func(cmd *cobra.Command, args []string) error { - cliCtx := context.NewCLIContext().WithCodec(cdc) - - res, _, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/%s", queryRoute, types.QueryCirculatingSupply), nil) - if err != nil { - fmt.Printf("could not get total circulating supply\n") - return err - } - - var out int64 - cdc.MustUnmarshalJSON(res, &out) - return cliCtx.PrintOutput(out) - }, - } -} - -// QueryTotalSupplyCmd queries the total supply of ukava -func QueryTotalSupplyCmd(queryRoute string, cdc *codec.Codec) *cobra.Command { - return &cobra.Command{ - Use: "total-supply", - Short: "Query total supply information", - - RunE: func(cmd *cobra.Command, args []string) error { - cliCtx := context.NewCLIContext().WithCodec(cdc) - - res, _, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/%s", queryRoute, types.QueryTotalSupply), nil) - if err != nil { - fmt.Printf("could not get total supply\n") - return err - } - - var out int64 - cdc.MustUnmarshalJSON(res, &out) - return cliCtx.PrintOutput(out) - }, - } -} diff --git a/x/validator-vesting/client/rest/query.go b/x/validator-vesting/client/rest/query.go deleted file mode 100644 index 0a9d6704..00000000 --- a/x/validator-vesting/client/rest/query.go +++ /dev/null @@ -1,105 +0,0 @@ -package rest - -import ( - "encoding/json" - "fmt" - "net/http" - - "github.com/gorilla/mux" - - "github.com/cosmos/cosmos-sdk/client/context" - "github.com/cosmos/cosmos-sdk/types/rest" - - "github.com/kava-labs/kava/x/validator-vesting/types" -) - -// define routes that get registered by the main application -func registerQueryRoutes(cliCtx context.CLIContext, r *mux.Router) { - - r.HandleFunc("/vesting/circulatingsupply", getCirculatingSupplyHandlerFn(cliCtx)).Methods("GET") - r.HandleFunc("/vesting/totalsupply", getTotalSupplyHandlerFn(cliCtx)).Methods("GET") - -} - -func getTotalSupplyHandlerFn(cliCtx context.CLIContext) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - _, page, limit, err := rest.ParseHTTPArgsWithLimit(r, 0) - if err != nil { - rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error()) - return - } - - cliCtx, ok := rest.ParseQueryHeightOrReturnBadRequest(w, cliCtx, r) - if !ok { - return - } - - params := types.NewBaseQueryParams(page, limit) - bz, err := cliCtx.Codec.MarshalJSON(params) - if err != nil { - rest.WriteErrorResponse(w, http.StatusBadRequest, fmt.Sprintf("failed to marshal query params: %s", err)) - return - } - - route := fmt.Sprintf("custom/%s/%s", types.QuerierRoute, types.QueryTotalSupply) - res, _, err := cliCtx.QueryWithData(route, bz) - if err != nil { - rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error()) - return - } - var totalSupply int64 - err = cliCtx.Codec.UnmarshalJSON(res, &totalSupply) - if err != nil { - rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error()) - return - } - resBytes, err := json.Marshal(totalSupply) - if err != nil { - rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error()) - return - } - w.Write(resBytes) - } -} - -func getCirculatingSupplyHandlerFn(cliCtx context.CLIContext) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - _, page, limit, err := rest.ParseHTTPArgsWithLimit(r, 0) - if err != nil { - rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error()) - return - } - - cliCtx, ok := rest.ParseQueryHeightOrReturnBadRequest(w, cliCtx, r) - if !ok { - return - } - - params := types.NewBaseQueryParams(page, limit) - bz, err := cliCtx.Codec.MarshalJSON(params) - if err != nil { - rest.WriteErrorResponse(w, http.StatusBadRequest, fmt.Sprintf("failed to marshal query params: %s", err)) - return - } - - route := fmt.Sprintf("custom/%s/%s", types.QuerierRoute, types.QueryCirculatingSupply) - res, _, err := cliCtx.QueryWithData(route, bz) - if err != nil { - rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error()) - return - } - - var circSupply int64 - err = cliCtx.Codec.UnmarshalJSON(res, &circSupply) - if err != nil { - rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error()) - return - } - resBytes, err := json.Marshal(circSupply) - if err != nil { - rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error()) - return - } - w.Write(resBytes) - } -} diff --git a/x/validator-vesting/client/rest/rest.go b/x/validator-vesting/client/rest/rest.go deleted file mode 100644 index 08620916..00000000 --- a/x/validator-vesting/client/rest/rest.go +++ /dev/null @@ -1,13 +0,0 @@ -package rest - -import ( - "github.com/cosmos/cosmos-sdk/client/context" - - "github.com/gorilla/mux" -) - -// RegisterRoutes - Central function to define routes that get registered by the main application -func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router) { - registerQueryRoutes(cliCtx, r) - -} diff --git a/x/validator-vesting/module.go b/x/validator-vesting/module.go index 70ed1636..29b726ed 100644 --- a/x/validator-vesting/module.go +++ b/x/validator-vesting/module.go @@ -15,8 +15,6 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" sim "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/kava-labs/kava/x/validator-vesting/client/cli" - "github.com/kava-labs/kava/x/validator-vesting/client/rest" "github.com/kava-labs/kava/x/validator-vesting/simulation" "github.com/kava-labs/kava/x/validator-vesting/types" ) @@ -56,16 +54,14 @@ func (AppModuleBasic) ValidateGenesis(bz json.RawMessage) error { } // RegisterRESTRoutes registers no REST routes for the crisis module. -func (AppModuleBasic) RegisterRESTRoutes(ctx context.CLIContext, rtr *mux.Router) { - rest.RegisterRoutes(ctx, rtr) -} +func (AppModuleBasic) RegisterRESTRoutes(ctx context.CLIContext, rtr *mux.Router) {} // GetTxCmd returns no root tx command for the validator-vesting module. func (AppModuleBasic) GetTxCmd(_ *codec.Codec) *cobra.Command { return nil } // GetQueryCmd returns no root query command for the validator-vesting module. func (AppModuleBasic) GetQueryCmd(cdc *codec.Codec) *cobra.Command { - return cli.GetQueryCmd(StoreKey, cdc) + return nil } // AppModule implements an application module for the validator-vesting module.