REST folder restructure & cleanup

x/auth/client/cli/account.go

@@ -0,0 +1,87 @@
+package cli
+
+import (
+	"encoding/hex"
+	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+
+	"github.com/cosmos/cosmos-sdk/client/context"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/wire"
+)
+
+// GetAccountCmd for the auth.BaseAccount type
+func GetAccountCmdDefault(storeName string, cdc *wire.Codec) *cobra.Command {
+	return GetAccountCmd(storeName, cdc, GetAccountDecoder(cdc))
+}
+
+// Get account decoder for auth.DefaultAccount
+func GetAccountDecoder(cdc *wire.Codec) sdk.AccountDecoder {
+	return func(accBytes []byte) (acct sdk.Account, err error) {
+		// acct := new(auth.BaseAccount)
+		err = cdc.UnmarshalBinaryBare(accBytes, &acct)
+		if err != nil {
+			panic(err)
+		}
+		return acct, err
+	}
+}
+
+// GetAccountCmd returns a query account that will display the
+// state of the account at a given address
+func GetAccountCmd(storeName string, cdc *wire.Codec, decoder sdk.AccountDecoder) *cobra.Command {
+	cmdr := commander{
+		storeName,
+		cdc,
+		decoder,
+	}
+	return &cobra.Command{
+		Use:   "account <address>",
+		Short: "Query account balance",
+		RunE:  cmdr.getAccountCmd,
+	}
+}
+
+type commander struct {
+	storeName string
+	cdc       *wire.Codec
+	decoder   sdk.AccountDecoder
+}
+
+func (c commander) getAccountCmd(cmd *cobra.Command, args []string) error {
+	if len(args) != 1 || len(args[0]) == 0 {
+		return errors.New("You must provide an account name")
+	}
+
+	// find the key to look up the account
+	addr := args[0]
+	bz, err := hex.DecodeString(addr)
+	if err != nil {
+		return err
+	}
+	key := sdk.Address(bz)
+
+	ctx := context.NewCoreContextFromViper()
+
+	res, err := ctx.Query(key, c.storeName)
+	if err != nil {
+		return err
+	}
+
+	// decode the value
+	account, err := c.decoder(res)
+	if err != nil {
+		return err
+	}
+
+	// print out whole account
+	output, err := wire.MarshalJSONIndent(c.cdc, account)
+	if err != nil {
+		return err
+	}
+	fmt.Println(string(output))
+
+	return nil
+}

x/auth/client/rest/query.go

@@ -0,0 +1,71 @@
+package rest
+
+import (
+	"encoding/hex"
+	"fmt"
+	"net/http"
+
+	"github.com/gorilla/mux"
+
+	"github.com/cosmos/cosmos-sdk/client/context"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/wire"
+	auth "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
+)
+
+// register REST routes
+func RegisterRoutes(r *mux.Router, cdc *wire.Codec, storeName string) {
+	ctx := context.NewCoreContextFromViper()
+
+	r.HandleFunc(
+		"/accounts/{address}",
+		QueryAccountRequestHandler(storeName, cdc, auth.GetAccountDecoder(cdc), ctx),
+	).Methods("GET")
+}
+
+// query accountREST Handler
+func QueryAccountRequestHandler(storeName string, cdc *wire.Codec, decoder sdk.AccountDecoder, ctx context.CoreContext) func(http.ResponseWriter, *http.Request) {
+	return func(w http.ResponseWriter, r *http.Request) {
+		vars := mux.Vars(r)
+		addr := vars["address"]
+
+		bz, err := hex.DecodeString(addr)
+		if err != nil {
+			w.WriteHeader(http.StatusBadRequest)
+			w.Write([]byte(err.Error()))
+			return
+		}
+		key := sdk.Address(bz)
+
+		res, err := ctx.Query(key, storeName)
+		if err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(fmt.Sprintf("Could't query account. Error: %s", err.Error())))
+			return
+		}
+
+		// the query will return empty if there is no data for this account
+		if len(res) == 0 {
+			w.WriteHeader(http.StatusNoContent)
+			return
+		}
+
+		// decode the value
+		account, err := decoder(res)
+		if err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(fmt.Sprintf("Could't parse query result. Result: %s. Error: %s", res, err.Error())))
+			return
+		}
+
+		// print out whole account
+		output, err := cdc.MarshalJSON(account)
+		if err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(fmt.Sprintf("Could't marshall query result. Error: %s", err.Error())))
+			return
+		}
+
+		w.Write(output)
+	}
+}