From 0360b12075f79e28f5c7b58e9f32032200967bd3 Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Wed, 19 Dec 2018 08:25:27 -0800 Subject: [PATCH] Remove unimplemented gaiacli init command (#3156) --- PENDING.md | 1 + client/lcd/root.go | 5 -- client/lcd/version.go | 29 ---------- client/rpc/root.go | 62 ++++++++++------------ cmd/gaia/cmd/gaiacli/main.go | 1 - docs/examples/basecoin/cmd/basecli/main.go | 1 - docs/examples/democoin/cmd/democli/main.go | 1 - 7 files changed, 28 insertions(+), 72 deletions(-) delete mode 100644 client/lcd/version.go diff --git a/PENDING.md b/PENDING.md index 280b3ee055..2954bb91fa 100644 --- a/PENDING.md +++ b/PENDING.md @@ -8,6 +8,7 @@ BREAKING CHANGES * [\#810](https://github.com/cosmos/cosmos-sdk/issues/810) Don't fallback to any default values for chain ID. - Users need to supply chain ID either via config file or the `--chain-id` flag. - Change `chain_id` and `trust_node` in `gaiacli` configuration to `chain-id` and `trust-node` respectively. + * [\#3156](https://github.com/cosmos/cosmos-sdk/pull/3156) Remove unimplemented `gaiacli init` command * Gaia diff --git a/client/lcd/root.go b/client/lcd/root.go index ad7ba2ff05..fd974cd73a 100644 --- a/client/lcd/root.go +++ b/client/lcd/root.go @@ -41,11 +41,6 @@ type RestServer struct { func NewRestServer(cdc *codec.Codec) *RestServer { r := mux.NewRouter() cliCtx := context.NewCLIContext().WithCodec(cdc).WithAccountDecoder(cdc) - - // Register version methods on the router - r.HandleFunc("/version", CLIVersionRequestHandler).Methods("GET") - r.HandleFunc("/node_version", NodeVersionRequestHandler(cliCtx)).Methods("GET") - logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)).With("module", "rest-server") return &RestServer{ diff --git a/client/lcd/version.go b/client/lcd/version.go deleted file mode 100644 index 4f4ce611ce..0000000000 --- a/client/lcd/version.go +++ /dev/null @@ -1,29 +0,0 @@ -package lcd - -import ( - "net/http" - - "github.com/cosmos/cosmos-sdk/client/context" - "github.com/cosmos/cosmos-sdk/client/utils" - "github.com/cosmos/cosmos-sdk/version" -) - -// 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(cliCtx context.CLIContext) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - version, err := cliCtx.Query("/app/version", nil) - if err != nil { - utils.WriteErrorResponse(w, http.StatusInternalServerError, err.Error()) - return - } - - w.Header().Set("Content-Type", "application/json") - w.Write(version) - } -} diff --git a/client/rpc/root.go b/client/rpc/root.go index c8a98bc447..cb25b47f31 100644 --- a/client/rpc/root.go +++ b/client/rpc/root.go @@ -1,48 +1,20 @@ package rpc import ( + "fmt" + "net/http" + "github.com/gorilla/mux" - "github.com/pkg/errors" - "github.com/spf13/cobra" - "github.com/spf13/viper" - - "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/context" + "github.com/cosmos/cosmos-sdk/client/utils" + "github.com/cosmos/cosmos-sdk/version" ) -const ( - // one of the following should be provided to verify the connection - flagGenesis = "genesis" - flagCommit = "commit" - flagValHash = "validator-set" -) - -// XXX: remove this when not needed -func todoNotImplemented(_ *cobra.Command, _ []string) error { - return errors.New("todo: Command not yet implemented") -} - -// InitClientCommand initializes client commands -func InitClientCommand() *cobra.Command { - cmd := &cobra.Command{ - Use: "init", - Short: "Initialize light client", - RunE: todoNotImplemented, - } - cmd.Flags().StringP(client.FlagChainID, "c", "", "ID of chain we connect to") - cmd.Flags().StringP(client.FlagNode, "n", "tcp://localhost:26657", "Node to connect to") - cmd.Flags().String(flagGenesis, "", "Genesis file to verify header validity") - cmd.Flags().String(flagCommit, "", "File with trusted and signed header") - cmd.Flags().String(flagValHash, "", "Hash of trusted validator set (hex-encoded)") - viper.BindPFlag(client.FlagChainID, cmd.Flags().Lookup(client.FlagChainID)) - viper.BindPFlag(client.FlagNode, cmd.Flags().Lookup(client.FlagNode)) - - return cmd -} - // Register REST endpoints func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router) { + r.HandleFunc("/version", CLIVersionRequestHandler).Methods("GET") + r.HandleFunc("/node_version", NodeVersionRequestHandler(cliCtx)).Methods("GET") r.HandleFunc("/node_info", NodeInfoRequestHandlerFn(cliCtx)).Methods("GET") r.HandleFunc("/syncing", NodeSyncingRequestHandlerFn(cliCtx)).Methods("GET") r.HandleFunc("/blocks/latest", LatestBlockRequestHandlerFn(cliCtx)).Methods("GET") @@ -50,3 +22,23 @@ func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router) { r.HandleFunc("/validatorsets/latest", LatestValidatorSetRequestHandlerFn(cliCtx)).Methods("GET") r.HandleFunc("/validatorsets/{height}", ValidatorSetRequestHandlerFn(cliCtx)).Methods("GET") } + +// cli version REST handler endpoint +func CLIVersionRequestHandler(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "application/json") + w.Write([]byte(fmt.Sprintf("{\"version\": \"%s\"}", version.GetVersion()))) +} + +// connected node version REST handler endpoint +func NodeVersionRequestHandler(cliCtx context.CLIContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + version, err := cliCtx.Query("/app/version", nil) + if err != nil { + utils.WriteErrorResponse(w, http.StatusInternalServerError, err.Error()) + return + } + + w.Header().Set("Content-Type", "application/json") + w.Write(version) + } +} diff --git a/cmd/gaia/cmd/gaiacli/main.go b/cmd/gaia/cmd/gaiacli/main.go index 354de8c5d0..d8e6aecaa9 100644 --- a/cmd/gaia/cmd/gaiacli/main.go +++ b/cmd/gaia/cmd/gaiacli/main.go @@ -80,7 +80,6 @@ func main() { // Construct Root Command rootCmd.AddCommand( - rpc.InitClientCommand(), rpc.StatusCommand(), client.ConfigCmd(), queryCmd(cdc, mc), diff --git a/docs/examples/basecoin/cmd/basecli/main.go b/docs/examples/basecoin/cmd/basecli/main.go index fe681a3ad8..088c927308 100644 --- a/docs/examples/basecoin/cmd/basecli/main.go +++ b/docs/examples/basecoin/cmd/basecli/main.go @@ -59,7 +59,6 @@ func main() { // add standard rpc, and tx commands rootCmd.AddCommand( - rpc.InitClientCommand(), rpc.StatusCommand(), client.LineBreak, tx.SearchTxCmd(cdc), diff --git a/docs/examples/democoin/cmd/democli/main.go b/docs/examples/democoin/cmd/democli/main.go index d3d0e5ff08..aa1080d087 100644 --- a/docs/examples/democoin/cmd/democli/main.go +++ b/docs/examples/democoin/cmd/democli/main.go @@ -55,7 +55,6 @@ func main() { // add standard rpc, and tx commands rootCmd.AddCommand( - rpc.InitClientCommand(), rpc.StatusCommand(), client.LineBreak, tx.SearchTxCmd(cdc),