Merge PR #1252: Query node version

introduce non store queries
add version query
update lcd spec
changelog
moved version query into baseapp

client/context/helpers.go

@@ -3,6 +3,8 @@ package context
 import (
 	"fmt"
 
+	"github.com/tendermint/tmlibs/common"
+
 	"github.com/pkg/errors"
 
 	"github.com/cosmos/cosmos-sdk/wire"
@@ -42,14 +44,19 @@ func (ctx CoreContext) BroadcastTx(tx []byte) (*ctypes.ResultBroadcastTxCommit,
 	return res, err
 }
 
-// Query from Tendermint with the provided key and storename
-func (ctx CoreContext) Query(key cmn.HexBytes, storeName string) (res []byte, err error) {
-	return ctx.query(key, storeName, "key")
+// Query information about the connected node
+func (ctx CoreContext) Query(path string) (res []byte, err error) {
+	return ctx.query(path, nil)
+}
+
+// QueryStore from Tendermint with the provided key and storename
+func (ctx CoreContext) QueryStore(key cmn.HexBytes, storeName string) (res []byte, err error) {
+	return ctx.queryStore(key, storeName, "key")
 }
 
 // Query from Tendermint with the provided storename and subspace
 func (ctx CoreContext) QuerySubspace(cdc *wire.Codec, subspace []byte, storeName string) (res []sdk.KVPair, err error) {
-	resRaw, err := ctx.query(subspace, storeName, "subspace")
+	resRaw, err := ctx.queryStore(subspace, storeName, "subspace")
 	if err != nil {
 		return res, err
 	}
@@ -58,8 +65,7 @@ func (ctx CoreContext) QuerySubspace(cdc *wire.Codec, subspace []byte, storeName
 }
 
 // Query from Tendermint with the provided storename and path
-func (ctx CoreContext) query(key cmn.HexBytes, storeName, endPath string) (res []byte, err error) {
-	path := fmt.Sprintf("/store/%s/%s", storeName, endPath)
+func (ctx CoreContext) query(path string, key common.HexBytes) (res []byte, err error) {
 	node, err := ctx.GetNode()
 	if err != nil {
 		return res, err
@@ -80,6 +86,12 @@ func (ctx CoreContext) query(key cmn.HexBytes, storeName, endPath string) (res [
 	return resp.Value, nil
 }
 
+// Query from Tendermint with the provided storename and path
+func (ctx CoreContext) queryStore(key cmn.HexBytes, storeName, endPath string) (res []byte, err error) {
+	path := fmt.Sprintf("/store/%s/%s", storeName, endPath)
+	return ctx.query(path, key)
+}
+
 // Get the from address from the name flag
 func (ctx CoreContext) GetFromAddress() (from sdk.Address, err error) {
 
@@ -177,7 +189,7 @@ func (ctx CoreContext) GetAccountNumber(address []byte) (int64, error) {
 		return 0, errors.New("accountDecoder required but not provided")
 	}
 
-	res, err := ctx.Query(auth.AddressStoreKey(address), ctx.AccountStore)
+	res, err := ctx.QueryStore(auth.AddressStoreKey(address), ctx.AccountStore)
 	if err != nil {
 		return 0, err
 	}
@@ -201,7 +213,7 @@ func (ctx CoreContext) NextSequence(address []byte) (int64, error) {
 		return 0, errors.New("accountDecoder required but not provided")
 	}
 
-	res, err := ctx.Query(auth.AddressStoreKey(address), ctx.AccountStore)
+	res, err := ctx.QueryStore(auth.AddressStoreKey(address), ctx.AccountStore)
 	if err != nil {
 		return 0, err
 	}

client/lcd/lcd_test.go

@@ -116,6 +116,15 @@ func TestVersion(t *testing.T) {
 	require.Nil(t, err)
 	match := reg.MatchString(body)
 	assert.True(t, match, body)
+
+	// node info
+	res, body = Request(t, port, "GET", "/node_version", nil)
+	require.Equal(t, http.StatusOK, res.StatusCode, body)
+
+	reg, err = regexp.Compile(`\d+\.\d+\.\d+(-dev)?`)
+	require.Nil(t, err)
+	match = reg.MatchString(body)
+	assert.True(t, match, body)
 }
 
 func TestNodeStatus(t *testing.T) {

client/lcd/root.go

@@ -17,7 +17,6 @@ import (
 	keys "github.com/cosmos/cosmos-sdk/client/keys"
 	rpc "github.com/cosmos/cosmos-sdk/client/rpc"
 	tx "github.com/cosmos/cosmos-sdk/client/tx"
-	version "github.com/cosmos/cosmos-sdk/version"
 	"github.com/cosmos/cosmos-sdk/wire"
 	auth "github.com/cosmos/cosmos-sdk/x/auth/client/rest"
 	bank "github.com/cosmos/cosmos-sdk/x/bank/client/rest"
@@ -63,7 +62,6 @@ func ServeCommand(cdc *wire.Codec) *cobra.Command {
 
 func createHandler(cdc *wire.Codec) http.Handler {
 	r := mux.NewRouter()
-	r.HandleFunc("/version", version.RequestHandler).Methods("GET")
 
 	kb, err := keys.GetKeyBase() //XXX
 	if err != nil {
@@ -73,6 +71,8 @@ func createHandler(cdc *wire.Codec) http.Handler {
 	ctx := context.NewCoreContextFromViper()
 
 	// TODO make more functional? aka r = keys.RegisterRoutes(r)
+	r.HandleFunc("/version", CLIVersionRequestHandler).Methods("GET")
+	r.HandleFunc("/node_version", NodeVersionRequestHandler(cdc, ctx)).Methods("GET")
 	keys.RegisterRoutes(r)
 	rpc.RegisterRoutes(ctx, r)
 	tx.RegisterRoutes(ctx, r, cdc)

client/lcd/version.go

@@ -0,0 +1,29 @@
+package lcd
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/cosmos/cosmos-sdk/client/context"
+	"github.com/cosmos/cosmos-sdk/version"
+	"github.com/cosmos/cosmos-sdk/wire"
+)
+
+// cli version REST handler endpoint
+func CLIVersionRequestHandler(w http.ResponseWriter, r *http.Request) {
+	v := version.GetVersion()
+	w.Write([]byte(v))
+}
+
+// connected node version REST handler endpoint
+func NodeVersionRequestHandler(cdc *wire.Codec, ctx context.CoreContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		version, err := ctx.Query("/app/version")
+		if err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(fmt.Sprintf("Could't query version. Error: %s", err.Error())))
+			return
+		}
+		w.Write([]byte(version))
+	}
+}