addressed comments

cosmos · Oct 30, 2018 · 4298c11 · 4298c11
1 parent eead819
commit 4298c11
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/client/lcd/lcd_test.go b/client/lcd/lcd_test.go
@@ -1236,7 +1236,7 @@ func getValidatorRedelegations(t *testing.T, port string, validatorAddr sdk.ValA
 // ============= Governance Module ================
 
 func getDepositProcedure(t *testing.T, port string) gov.DepositProcedure {
- res, body := Request(t, port, "GET", "/gov/procedure/deposit", nil)
+ res, body := Request(t, port, "GET", "/gov/procedures/deposit", nil)
  require.Equal(t, http.StatusOK, res.StatusCode, body)
 
  var depositProcedure gov.DepositProcedure
@@ -1246,7 +1246,7 @@ func getDepositProcedure(t *testing.T, port string) gov.DepositProcedure {
 }
 
 func getVotingProcedure(t *testing.T, port string) gov.VotingProcedure {
- res, body := Request(t, port, "GET", "/gov/procedure/voting", nil)
+ res, body := Request(t, port, "GET", "/gov/procedures/voting", nil)
  require.Equal(t, http.StatusOK, res.StatusCode, body)
 
  var votingProcedure gov.VotingProcedure
@@ -1256,7 +1256,7 @@ func getVotingProcedure(t *testing.T, port string) gov.VotingProcedure {
 }
 
 func getTallyingProcedure(t *testing.T, port string) gov.TallyingProcedure {
- res, body := Request(t, port, "GET", "/gov/procedure/tallying", nil)
+ res, body := Request(t, port, "GET", "/gov/procedures/tallying", nil)
  require.Equal(t, http.StatusOK, res.StatusCode, body)
 
  var tallyingProcedure gov.TallyingProcedure

diff --git a/x/gov/client/rest/rest.go b/x/gov/client/rest/rest.go
@@ -37,7 +37,7 @@ func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *codec.Codec)
  r.HandleFunc(fmt.Sprintf("/gov/proposals/{%s}/deposits", RestProposalID), depositHandlerFn(cdc, cliCtx)).Methods("POST")
  r.HandleFunc(fmt.Sprintf("/gov/proposals/{%s}/votes", RestProposalID), voteHandlerFn(cdc, cliCtx)).Methods("POST")
 
- r.HandleFunc(fmt.Sprintf("/gov/procedure/{%s}", RestProcedureType), queryProcedureHandlerFn(cdc, cliCtx)).Methods("GET")
+ r.HandleFunc(fmt.Sprintf("/gov/procedures/{%s}", RestProcedureType), queryProcedureHandlerFn(cdc, cliCtx)).Methods("GET")
 
  r.HandleFunc("/gov/proposals", queryProposalsWithParameterFn(cdc, cliCtx)).Methods("GET")
  r.HandleFunc(fmt.Sprintf("/gov/proposals/{%s}", RestProposalID), queryProposalHandlerFn(cdc, cliCtx)).Methods("GET")
@@ -189,7 +189,7 @@ func queryProcedureHandlerFn(cdc *codec.Codec, cliCtx context.CLIContext) http.H
  vars := mux.Vars(r)
  procedureType := vars[RestProcedureType]
 
- res, err := cliCtx.QueryWithData(fmt.Sprintf("custom/gov/procedure/%s", procedureType), nil)
+ res, err := cliCtx.QueryWithData(fmt.Sprintf("custom/gov/procedures/%s", procedureType), nil)
  if err != nil {
  utils.WriteErrorResponse(w, http.StatusNotFound, err.Error())
  return

diff --git a/x/gov/queryable.go b/x/gov/queryable.go
@@ -10,21 +10,25 @@ import (
 
 // query endpoints supported by the governance Querier
 const (
- QueryProcedure = "procedure"
- QueryProposals = "proposals"
- QueryProposal = "proposal"
- QueryDeposits = "deposits"
- QueryDeposit = "deposit"
- QueryVotes = "votes"
- QueryVote = "vote"
- QueryTally = "tally"
+ QueryProcedures = "procedures"
+ QueryProposals = "proposals"
+ QueryProposal = "proposal"
+ QueryDeposits = "deposits"
+ QueryDeposit = "deposit"
+ QueryVotes = "votes"
+ QueryVote = "vote"
+ QueryTally = "tally"
+
+ ProcedureDeposit = "deposit"
+ ProcedureVoting = "voting"
+ ProcedureTallying = "tallying"
 )
 
 func NewQuerier(keeper Keeper) sdk.Querier {
  return func(ctx sdk.Context, path []string, req abci.RequestQuery) (res []byte, err sdk.Error) {
  switch path[0] {
- case QueryProcedure:
- return queryProcedure(ctx, path[1:], req, keeper)
+ case QueryProcedures:
+ return queryProcedures(ctx, path[1:], req, keeper)
  case QueryProposals:
  return queryProposals(ctx, path[1:], req, keeper)
  case QueryProposal:
@@ -45,21 +49,21 @@ func NewQuerier(keeper Keeper) sdk.Querier {
  }
 }
 
-func queryProcedure(ctx sdk.Context, path []string, req abci.RequestQuery, keeper Keeper) (res []byte, err sdk.Error) {
+func queryProcedures(ctx sdk.Context, path []string, req abci.RequestQuery, keeper Keeper) (res []byte, err sdk.Error) {
  switch path[0] {
- case "deposit":
+ case ProcedureDeposit:
  bz, err2 := codec.MarshalJSONIndent(keeper.cdc, keeper.GetDepositProcedure(ctx))
  if err2 != nil {
  return nil, sdk.ErrInternal(sdk.AppendMsgToErr("could not marshal result to JSON", err2.Error()))
  }
  return bz, nil
- case "voting":
+ case ProcedureVoting:
  bz, err2 := codec.MarshalJSONIndent(keeper.cdc, keeper.GetVotingProcedure(ctx))
  if err2 != nil {
  return nil, sdk.ErrInternal(sdk.AppendMsgToErr("could not marshal result to JSON", err2.Error()))
  }
  return bz, nil
- case "tallying":
+ case ProcedureTallying:
  bz, err2 := codec.MarshalJSONIndent(keeper.cdc, keeper.GetTallyingProcedure(ctx))
  if err2 != nil {
  return nil, sdk.ErrInternal(sdk.AppendMsgToErr("could not marshal result to JSON", err2.Error()))