Reorganize CLI command structure. Fixes #2575

client/rpc/root.go

@@ -22,15 +22,7 @@ func todoNotImplemented(_ *cobra.Command, _ []string) error {
 	return errors.New("todo: Command not yet implemented")
 }
 
-// AddCommands adds a number of rpc-related subcommands
-func AddCommands(cmd *cobra.Command) {
-	cmd.AddCommand(
-		initClientCommand(),
-		statusCommand(),
-	)
-}
-
-func initClientCommand() *cobra.Command {
+func InitClientCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "init",
 		Short: "Initialize light client",

client/rpc/status.go

@@ -14,7 +14,8 @@ import (
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 )
 
-func statusCommand() *cobra.Command {
+// StatusCommand returns the status of the network
+func StatusCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "status",
 		Short: "Query remote node for status",

client/tx/root.go

@@ -2,20 +2,11 @@ package tx
 
 import (
 	"github.com/gorilla/mux"
-	"github.com/spf13/cobra"
 
 	"github.com/cosmos/cosmos-sdk/client/context"
 	"github.com/cosmos/cosmos-sdk/codec"
 )
 
-// AddCommands adds a number of tx-query related subcommands
-func AddCommands(cmd *cobra.Command, cdc *codec.Codec) {
-	cmd.AddCommand(
-		SearchTxCmd(cdc),
-		QueryTxCmd(cdc),
-	)
-}
-
 // register REST routes
 func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *codec.Codec) {
 	r.HandleFunc("/txs/{hash}", QueryTxRequestHandlerFn(cdc, cliCtx)).Methods("GET")