Move all subcommands out of main into proper folders

examples/basecoin/cmd/basecli/client.go

@@ -1,110 +0,0 @@
-package main
-
-import (
-	"github.com/spf13/cobra"
-
-	"github.com/cosmos/cosmos-sdk/client"
-)
-
-const (
-	// one of the following should be provided to verify the connection
-	flagGenesis = "genesis"
-	flagCommit  = "commit"
-	flagValHash = "validator-set"
-
-	flagSelect = "select"
-	flagTags   = "tag"
-	flagAny    = "any"
-
-	flagBind = "bind"
-	flagCORS = "cors"
-)
-
-var (
-	statusCmd = &cobra.Command{
-		Use:   "status",
-		Short: "Query remote node for status",
-		RunE:  todoNotImplemented,
-	}
-)
-
-// AddClientCommands returns a sub-tree of all basic client commands
-//
-// Call AddGetCommand and AddPostCommand to add custom txs and queries
-func AddClientCommands(cmd *cobra.Command) {
-	cmd.AddCommand(
-		initClientCommand(),
-		statusCmd,
-		blockCommand(),
-		validatorCommand(),
-		lineBreak,
-		txSearchCommand(),
-		txCommand(),
-		lineBreak,
-	)
-}
-
-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:46657", "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)")
-	return cmd
-}
-
-func blockCommand() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "block <height>",
-		Short: "Get verified data for a the block at given height",
-		RunE:  todoNotImplemented,
-	}
-	cmd.Flags().StringSlice(flagSelect, []string{"header", "tx"}, "Fields to return (header|txs|results)")
-	return cmd
-}
-
-func validatorCommand() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "validatorset <height>",
-		Short: "Get the full validator set at given height",
-		RunE:  todoNotImplemented,
-	}
-	return cmd
-}
-
-func serveCommand() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "serve",
-		Short: "Start LCD (light-client daemon), a local REST server",
-		RunE:  todoNotImplemented,
-	}
-	// TODO: handle unix sockets also?
-	cmd.Flags().StringP(flagBind, "b", "localhost:1317", "Interface and port that server binds to")
-	cmd.Flags().String(flagCORS, "", "Set to domains that can make CORS requests (* for all)")
-	return cmd
-}
-
-func txSearchCommand() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "txs",
-		Short: "Search for all transactions that match the given tags",
-		RunE:  todoNotImplemented,
-	}
-	cmd.Flags().StringSlice(flagTags, nil, "Tags that must match (may provide multiple)")
-	cmd.Flags().Bool(flagAny, false, "Return transactions that match ANY tag, rather than ALL")
-	return cmd
-}
-
-func txCommand() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "tx <hash>",
-		Short: "Matches this txhash over all committed blocks",
-		RunE:  todoNotImplemented,
-	}
-	return cmd
-}

examples/basecoin/cmd/basecli/main.go

@@ -10,6 +10,9 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/keys"
+	"github.com/cosmos/cosmos-sdk/client/lcd"
+	"github.com/cosmos/cosmos-sdk/client/rpc"
+	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/cosmos/cosmos-sdk/version"
 	bankcmd "github.com/cosmos/cosmos-sdk/x/bank/commands"
 )
@@ -20,8 +23,6 @@ var (
 		Use:   "basecli",
 		Short: "Basecoin light-client",
 	}
-
-	lineBreak = &cobra.Command{Run: func(*cobra.Command, []string) {}}
 )
 
 func todoNotImplemented(_ *cobra.Command, _ []string) error {
@@ -32,10 +33,13 @@ func main() {
 	// disable sorting
 	cobra.EnableCommandSorting = false
 
-	// generic client commands
-	AddClientCommands(basecliCmd)
+	// add standard rpc, and tx commands
+	rpc.AddCommands(basecliCmd)
+	basecliCmd.AddCommand(client.LineBreak)
+	tx.AddCommands(basecliCmd)
+	basecliCmd.AddCommand(client.LineBreak)
 
-	// query/post commands (custom to binary)
+	// add query/post commands (custom to binary)
 	basecliCmd.AddCommand(
 		client.GetCommands(
 			bankcmd.GetAccountCmd("main"),
@@ -47,10 +51,10 @@ func main() {
 
 	// add proxy, version and key info
 	basecliCmd.AddCommand(
-		lineBreak,
-		serveCommand(),
+		client.LineBreak,
+		lcd.ServeCommand(),
 		keys.Commands(),
-		lineBreak,
+		client.LineBreak,
 		version.VersionCmd,
 	)