From 3413a2bff1d8aa2b6bcb26652deecce57da0808b Mon Sep 17 00:00:00 2001 From: Matthew Slipper Date: Tue, 21 Aug 2018 17:53:16 -0700 Subject: [PATCH 1/2] Remove --select in block command (#2060) Closes #1968. --- PENDING.md | 1 + client/rpc/block.go | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/PENDING.md b/PENDING.md index 7f297c0f3..159d4fa96 100644 --- a/PENDING.md +++ b/PENDING.md @@ -41,6 +41,7 @@ IMPROVEMENTS * [x/stake] \#2000 Added tests for new staking endpoints * Gaia CLI (`gaiacli`) + * [cli] #2060 removed `--select` from `block` command * Gaia * [x/stake] [#2023](https://github.com/cosmos/cosmos-sdk/pull/2023) Terminate iteration loop in `UpdateBondedValidators` and `UpdateBondedValidatorsFull` when the first revoked validator is encountered and perform a sanity check. diff --git a/client/rpc/block.go b/client/rpc/block.go index fb4376bc1..d16f38342 100644 --- a/client/rpc/block.go +++ b/client/rpc/block.go @@ -12,10 +12,6 @@ import ( "github.com/spf13/cobra" ) -const ( - flagSelect = "select" -) - //BlockCommand returns the verified block data for a given heights func BlockCommand() *cobra.Command { cmd := &cobra.Command{ @@ -27,7 +23,6 @@ func BlockCommand() *cobra.Command { cmd.Flags().StringP(client.FlagNode, "n", "tcp://localhost:26657", "Node to connect to") // TODO: change this to false when we can cmd.Flags().Bool(client.FlagTrustNode, true, "Don't verify proofs for responses") - cmd.Flags().StringSlice(flagSelect, []string{"header", "tx"}, "Fields to return (header|txs|results)") return cmd } @@ -38,7 +33,6 @@ func getBlock(cliCtx context.CLIContext, height *int64) ([]byte, error) { return nil, err } - // TODO: actually honor the --select flag! // header -> BlockchainInfo // header, tx -> Block // results -> BlockResults From 62d6fd2f982ec453482a213fca9c58c03963a08d Mon Sep 17 00:00:00 2001 From: Matthew Slipper Date: Tue, 21 Aug 2018 20:22:18 -0700 Subject: [PATCH 2/2] Merge PR #2014: Remove advanced gaiacli command Closes #1965 --- PENDING.md | 1 + cmd/gaia/cmd/gaiacli/main.go | 10 +--------- docs/clients/lcd-rest-api.yaml | 2 +- docs/clients/rest.md | 2 +- docs/validators/validator-setup.md | 2 +- .../ansible/roles/add-lcd/templates/gaiacli.service.j2 | 2 +- 6 files changed, 6 insertions(+), 13 deletions(-) diff --git a/PENDING.md b/PENDING.md index 159d4fa96..cb80119a9 100644 --- a/PENDING.md +++ b/PENDING.md @@ -8,6 +8,7 @@ BREAKING CHANGES * Gaia CLI (`gaiacli`) * [x/stake] Validator.Owner renamed to Validator.Operator * [cli] unsafe_reset_all, show_validator, and show_node_id have been renamed to unsafe-reset-all, show-validator, and show-node-id + * [cli] \#2014 `gaiacli advanced` no longer exists - to access `ibc`, `rest-server`, and `validator-set` commands use `gaiacli ibc`, `gaiacli rest-server`, and `gaiacli tendermint`, respectively * Gaia * Make the transient store key use a distinct store key. [#2013](https://github.com/cosmos/cosmos-sdk/pull/2013) diff --git a/cmd/gaia/cmd/gaiacli/main.go b/cmd/gaia/cmd/gaiacli/main.go index d447504af..25c670bdd 100644 --- a/cmd/gaia/cmd/gaiacli/main.go +++ b/cmd/gaia/cmd/gaiacli/main.go @@ -62,18 +62,10 @@ func main() { ibccmd.IBCRelayCmd(cdc), )...) - advancedCmd := &cobra.Command{ - Use: "advanced", - Short: "Advanced subcommands", - } - - advancedCmd.AddCommand( + rootCmd.AddCommand( tendermintCmd, ibcCmd, lcd.ServeCommand(cdc), - ) - rootCmd.AddCommand( - advancedCmd, client.LineBreak, ) diff --git a/docs/clients/lcd-rest-api.yaml b/docs/clients/lcd-rest-api.yaml index 3b8349f4b..5be69302d 100644 --- a/docs/clients/lcd-rest-api.yaml +++ b/docs/clients/lcd-rest-api.yaml @@ -2,7 +2,7 @@ swagger: '2.0' info: version: '1.1.0' title: Gaia-Lite (former LCD) to interface with Cosmos BaseServer via REST - description: Specification for Gaia-lite provided by `gaiacli advanced rest-server` + description: Specification for Gaia-lite provided by `gaiacli rest-server` tags: - name: keys diff --git a/docs/clients/rest.md b/docs/clients/rest.md index 190eeb1f3..b48ec7d8f 100644 --- a/docs/clients/rest.md +++ b/docs/clients/rest.md @@ -1,6 +1,6 @@ # REST -See `gaiacli advanced rest-server --help` for more. +See `gaiacli rest-server --help` for more. Also see the [work in progress API specification](https://github.com/cosmos/cosmos-sdk/pull/1314) diff --git a/docs/validators/validator-setup.md b/docs/validators/validator-setup.md index 88a542dc0..e56c3c691 100644 --- a/docs/validators/validator-setup.md +++ b/docs/validators/validator-setup.md @@ -89,7 +89,7 @@ gaiacli stake unrevoke \ Your validator is active if the following command returns anything: ```bash -gaiacli advanced tendermint validator-set | grep "$(gaiad tendermint show-validator)" +gaiacli tendermint validator-set | grep "$(gaiad tendermint show-validator)" ``` You should also be able to see your validator on the [Explorer](https://explorecosmos.network/validators). You are looking for the `bech32` encoded `address` in the `~/.gaiad/config/priv_validator.json` file. diff --git a/networks/remote/ansible/roles/add-lcd/templates/gaiacli.service.j2 b/networks/remote/ansible/roles/add-lcd/templates/gaiacli.service.j2 index 4f189f8f5..0d562163c 100644 --- a/networks/remote/ansible/roles/add-lcd/templates/gaiacli.service.j2 +++ b/networks/remote/ansible/roles/add-lcd/templates/gaiacli.service.j2 @@ -8,7 +8,7 @@ Restart=on-failure User=gaiad Group=gaiad PermissionsStartOnly=true -ExecStart=/usr/bin/gaiacli advanced rest-server --laddr {{GAIAD_ADDRESS}} +ExecStart=/usr/bin/gaiacli rest-server --laddr {{GAIAD_ADDRESS}} ExecReload=/bin/kill -HUP $MAINPID KillSignal=SIGTERM