update auth rest handlers

x/auth/client/rest/query.go

@@ -3,6 +3,7 @@ package rest
 import (
 	"fmt"
 	"net/http"
+	"strconv"
 	"strings"
 
 	"github.com/gorilla/mux"
@@ -12,7 +13,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/rest"
 	"github.com/cosmos/cosmos-sdk/x/auth/client/utils"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
-	genutilRest "github.com/cosmos/cosmos-sdk/x/genutil/client/rest"
+	genutilrest "github.com/cosmos/cosmos-sdk/x/genutil/client/rest"
 )
 
 // query accountREST Handler
@@ -54,34 +55,29 @@ func QueryAccountRequestHandlerFn(storeName string, cliCtx context.CLIContext) h
 // QueryTxsHandlerFn implements a REST handler that searches for transactions.
 // Genesis transactions are returned if the height parameter is set to zero,
 // otherwise the transactions are searched for by events.
-func QueryTxsHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
-	heightStr := r.FormValue("height")
-	if heightStr != "" {
-		if height, err := strconv.ParseInt(heightStr, 10, 64); err != nil && height == 0 {
-			return genutilRest.QueryGenesisTxs(cliCtx)
+func QueryTxsRequestHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		err := r.ParseForm()
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusBadRequest,
+				sdk.AppendMsgToErr("could not parse query parameters", err.Error()))
+			return
 		}
-	}
 
-	return QueryTxsByEventsRequestHandlerFn(cliCtx)
-}
+		heightStr := r.FormValue("height")
+		if heightStr != "" {
+			if height, err := strconv.ParseInt(heightStr, 10, 64); err != nil && height == 0 {
+				genutilrest.QueryGenesisTxs(cliCtx, w)
+				return
+			}
+		}
 
-// QueryTxsByEventsRequestHandlerFn implements a REST handler that searches for
-// transactions by events.
-func QueryTxsByEventsRequestHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
 		var (
 			tags        []string
 			txs         []sdk.TxResponse
 			page, limit int
 		)
 
-		err := r.ParseForm()
-		if err != nil {
-			rest.WriteErrorResponse(w, http.StatusBadRequest,
-				sdk.AppendMsgToErr("could not parse query parameters", err.Error()))
-			return
-		}
-
 		cliCtx, ok := rest.ParseQueryHeightOrReturnBadRequest(w, cliCtx, r)
 		if !ok {
 			return

x/auth/client/rest/rest.go

@@ -16,7 +16,7 @@ func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router, storeName string)
 // RegisterTxRoutes registers all transaction routes on the provided router.
 func RegisterTxRoutes(cliCtx context.CLIContext, r *mux.Router) {
 	r.HandleFunc("/txs/{hash}", QueryTxRequestHandlerFn(cliCtx)).Methods("GET")
-	r.HandleFunc("/txs", QueryTxsHandlerFn(cliCtx)).Methods("GET")
+	r.HandleFunc("/txs", QueryTxsRequestHandlerFn(cliCtx)).Methods("GET")
 	r.HandleFunc("/txs", BroadcastTxRequest(cliCtx)).Methods("POST")
 	r.HandleFunc("/txs/encode", EncodeTxRequestHandlerFn(cliCtx)).Methods("POST")
 }

x/genutil/client/rest/query.go

@@ -1,7 +1,6 @@
 package query
 
 import (
-	"encoding/json"
 	"net/http"
 
 	"github.com/cosmos/cosmos-sdk/client/context"
@@ -10,34 +9,33 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/genutil/types"
 )
 
-// QueryGenesisTxs implements a REST handler that returns genesis transactions.
-func QueryGenesisTxs(cliCtx context.CLIContext) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		genDoc, err := cliCtx.Client.HistoryClient.Genesis()
-		if err != nil {
-			rest.WriteErrorResponse(w, http.StatusInternalServerError,
-				sdk.AppendMsgToErr("could not retrieve genesis doc", err.Error()))
-			return
-		}
+// QueryGenesisTxs writes the genesis transactions to the response if no error
+// occurs.
+func QueryGenesisTxs(cliCtx context.CLIContext, w http.ResponseWriter) {
+	resultGenesis, err := cliCtx.Client.Genesis()
+	if err != nil {
+		rest.WriteErrorResponse(w, http.StatusInternalServerError,
+			sdk.AppendMsgToErr("could not retrieve genesis from client", err.Error()))
+		return
+	}
 
-		appState, err := types.GenesisStateFromGenDoc(cliCtx.Codec, genDoc)
+	appState, err := types.GenesisStateFromGenDoc(cliCtx.Codec, *resultGenesis.Genesis)
+	if err != nil {
+		rest.WriteErrorResponse(w, http.StatusInternalServerError,
+			sdk.AppendMsgToErr("could not decode genesis doc", err.Error()))
+		return
+	}
+
+	genState := types.GetGenesisStateFromAppState(cliCtx.Codec, appState)
+	genTxs := make([]sdk.Tx, len(genState.GenTxs))
+	for i, tx := range genState.GenTxs {
+		err := cliCtx.Codec.UnmarshalJSON(tx, &genTxs[i])
 		if err != nil {
 			rest.WriteErrorResponse(w, http.StatusInternalServerError,
-				sdk.AppendMsgToErr("could not decode genesis doc", err.Error()))
+				sdk.AppendMsgToErr("could not decode genesis transaction", err.Error()))
 			return
 		}
-
-		genState, err := types.GetGenesisStateFromAppState(cliCtx.Codec, appState)
-		genTxs := make([]sdk.Tx, len(genState.GenTxs))
-		for i, tx := range genState.GenTxs {
-			err := cliCtx.Codec.UnmarshalJSON(tx, &genTxs[i])
-			if err != nil {
-				rest.WriteErrorResponse(w, http.StatusInternalServerError,
-					sdk.AppendMsgToErr("could not decode genesis transaction", err.Error()))
-				return
-			}
-		}
-
-		rest.PostProcessResponse(w, cliCtx, genTxs)
 	}
+
+	rest.PostProcessResponse(w, cliCtx, genTxs)
 }