Remove docs/clients/lcd-rest-api.yaml and add its content to client/lcd/swagger-ui/swagger.json

client/lcd/root.go

@@ -18,12 +18,12 @@ import (
 	slashing "github.com/cosmos/cosmos-sdk/x/slashing/client/rest"
 	stake "github.com/cosmos/cosmos-sdk/x/stake/client/rest"
 	"github.com/gorilla/mux"
+	"github.com/rakyll/statik/fs"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	cmn "github.com/tendermint/tendermint/libs/common"
 	"github.com/tendermint/tendermint/libs/log"
 	tmserver "github.com/tendermint/tendermint/rpc/lib/server"
-	"github.com/rakyll/statik/fs"
 )
 
 const (
@@ -134,119 +134,6 @@ func createHandler(cdc *codec.Codec) http.Handler {
 		panic(err)
 	}
 
-	cliCtx := context.NewCLIContext().WithCodec(cdc).WithLogger(os.Stdout)
-
-	// TODO: make more functional? aka r = keys.RegisterRoutes(r)
-	r.HandleFunc("/version", CLIVersionRequestHandler).Methods("GET")
-	r.HandleFunc("/node_version", NodeVersionRequestHandler(cliCtx)).Methods("GET")
-
-	keys.RegisterRoutes(r)
-	rpc.RegisterRoutes(cliCtx, r)
-	tx.RegisterRoutes(cliCtx, r, cdc)
-	auth.RegisterRoutes(cliCtx, r, cdc, "acc")
-	bank.RegisterRoutes(cliCtx, r, cdc, kb)
-	stake.RegisterRoutes(cliCtx, r, cdc, kb)
-	slashing.RegisterRoutes(cliCtx, r, cdc, kb)
-	gov.RegisterRoutes(cliCtx, r, cdc)
-
-	return r
-}
-
-// ServeLiteCommand will generate a long-running rest server for gaia-lite
-func ServeLiteCommand(cdc *codec.Codec) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "lite-server",
-		Short: "Start Gaia-lite (light-client daemon), a local REST server with swagger-ui, default url: http://localhost:1317/swagger-ui/",
-		RunE: func(cmd *cobra.Command, args []string) (err error) {
-			listenAddr := viper.GetString(flagListenAddr)
-			handler := createLiteHandler(cdc)
-			logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)).With("module", "gaia-lite")
-			maxOpen := viper.GetInt(flagMaxOpenConnections)
-			sslHosts := viper.GetString(flagSSLHosts)
-			certFile := viper.GetString(flagSSLCertFile)
-			keyFile := viper.GetString(flagSSLKeyFile)
-			cleanupFunc := func() {}
-
-			var listener net.Listener
-			var fingerprint string
-			if viper.GetBool(flagInsecure) {
-				listener, err = tmserver.StartHTTPServer(
-					listenAddr, handler, logger,
-					tmserver.Config{MaxOpenConnections: maxOpen},
-				)
-				if err != nil {
-					return
-				}
-			} else {
-				if certFile != "" {
-					// validateCertKeyFiles() is needed to work around tendermint/tendermint#2460
-					err = validateCertKeyFiles(certFile, keyFile)
-					if err != nil {
-						return err
-					}
-					//  cert/key pair is provided, read the fingerprint
-					fingerprint, err = fingerprintFromFile(certFile)
-					if err != nil {
-						return err
-					}
-				} else {
-					// if certificate is not supplied, generate a self-signed one
-					certFile, keyFile, fingerprint, err = genCertKeyFilesAndReturnFingerprint(sslHosts)
-					if err != nil {
-						return err
-					}
-					cleanupFunc = func() {
-						os.Remove(certFile)
-						os.Remove(keyFile)
-					}
-					defer cleanupFunc()
-				}
-				listener, err = tmserver.StartHTTPAndTLSServer(
-					listenAddr, handler,
-					certFile, keyFile,
-					logger,
-					tmserver.Config{MaxOpenConnections: maxOpen},
-				)
-				if err != nil {
-					return
-				}
-				logger.Info(fingerprint)
-			}
-			logger.Info("Gaia-lite REST server started")
-
-			// wait forever and cleanup
-			cmn.TrapSignal(func() {
-				defer cleanupFunc()
-				err := listener.Close()
-				logger.Error("error closing listener", "err", err)
-			})
-
-			return nil
-		},
-	}
-
-	cmd.Flags().String(flagListenAddr, "tcp://localhost:1317", "The address for the server to listen on")
-	cmd.Flags().Bool(flagInsecure, false, "Do not set up SSL/TLS layer")
-	cmd.Flags().String(flagSSLHosts, "", "Comma-separated hostnames and IPs to generate a certificate for")
-	cmd.Flags().String(flagSSLCertFile, "", "Path to a SSL certificate file. If not supplied, a self-signed certificate will be generated.")
-	cmd.Flags().String(flagSSLKeyFile, "", "Path to a key file; ignored if a certificate file is not supplied.")
-	cmd.Flags().String(flagCORS, "", "Set the domains that can make CORS requests (* for all)")
-	cmd.Flags().String(client.FlagChainID, "", "Chain ID of Tendermint node")
-	cmd.Flags().String(client.FlagNode, "tcp://localhost:26657", "Address of the node to connect to")
-	cmd.Flags().Int(flagMaxOpenConnections, 1000, "The number of maximum open connections")
-	cmd.Flags().Bool(client.FlagTrustNode, false, "Trust connected full node (don't verify proofs for responses)")
-
-	return cmd
-}
-
-func createLiteHandler(cdc *codec.Codec) *mux.Router {
-	r := mux.NewRouter()
-
-	kb, err := keys.GetKeyBase() //XXX
-	if err != nil {
-		panic(err)
-	}
-
 	statikFS, err := fs.New()
 	if err != nil {
 		panic(err)

client/rpc/block.go

@@ -61,7 +61,7 @@ func getBlock(cliCtx context.CLIContext, height *int64) ([]byte, error) {
 
 	// TODO move maarshalling into cmd/rest functions
 	// output, err := tmcodec.MarshalJSON(res)
-	output, err := cdc.MarshalJSON(res)
+	output, err := cdc.MarshalJSONIndent(res, "", "  ")
 	if err != nil {
 		return nil, err
 	}

client/rpc/status.go

@@ -64,7 +64,7 @@ func NodeInfoRequestHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
 		}
 
 		nodeInfo := status.NodeInfo
-		output, err := cdc.MarshalJSON(nodeInfo)
+		output, err := cdc.MarshalJSONIndent(nodeInfo, "", "  ")
 		if err != nil {
 			w.WriteHeader(500)
 			w.Write([]byte(err.Error()))

client/rpc/validators.go

@@ -94,7 +94,7 @@ func getValidators(cliCtx context.CLIContext, height *int64) ([]byte, error) {
 		}
 	}
 
-	output, err := cdc.MarshalJSON(outputValidatorsRes)
+	output, err := cdc.MarshalJSONIndent(outputValidatorsRes, "", "  ")
 	if err != nil {
 		return nil, err
 	}