Merge PR #2014: Remove advanced gaiacli command

Closes #1965
cosmos · Aug 22, 2018 · 62d6fd2 · 62d6fd2
1 parent 3413a2b
commit 62d6fd2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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