LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Move all subcommands out of main into proper folders

Browse Source
This commit is contained in:
Ethan Frey
2018-03-01 02:36:57 +00:00
committed by rigelrozanski
parent 7779eec990
commit bae7cec3fa
6 changed files with 108 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/flags.go
+4
View File
@@ -10,6 +10,10 @@ const (
FlagName = "name"
)
// LineBreak can be included in a command list to provide a blank line
// to help with readability
var LineBreak = &cobra.Command{Run: func(*cobra.Command, []string) {}}
// GetCommands adds common flags to query commands
func GetCommands(cmds ...*cobra.Command) []*cobra.Command {
for _, c := range cmds {
client/keys/root.go
+2 -3
View File
@@ -15,11 +15,10 @@
package keys
import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/spf13/cobra"
)
var lineBreak = &cobra.Command{Run: func(*cobra.Command, []string) {}}
// Commands registers a sub-tree of commands to interact with
// local private key storage.
func Commands() *cobra.Command {
@@ -36,7 +35,7 @@ func Commands() *cobra.Command {
addKeyCommand(),
listKeysCmd,
showKeysCmd,
lineBreak,
client.LineBreak,
deleteKeyCommand(),
updateKeyCommand(),
)
client/lcd/root.go
+36
View File
@@ -0,0 +1,36 @@
package lcd
import (
"errors"
"github.com/spf13/cobra"
"github.com/cosmos/cosmos-sdk/client"
)
const (
flagBind = "bind"
flagCORS = "cors"
)
// XXX: remove this when not needed
func todoNotImplemented(_ *cobra.Command, _ []string) error {
return errors.New("TODO: Command not yet implemented")
}
// ServeCommand will generate a long-running rest server
// (aka Light Client Daemon) that exposes functionality similar
// to the cli, but over rest
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)")
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")
return cmd
}
examples/basecoin/cmd/basecli/client.go → client/rpc/root.go
+9 -46
View File
@@ -1,11 +1,17 @@
package main
package rpc
import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/cosmos/cosmos-sdk/client"
)
// XXX: remove this when not needed
func todoNotImplemented(_ *cobra.Command, _ []string) error {
return errors.New("TODO: Command not yet implemented")
}
const (
// one of the following should be provided to verify the connection
flagGenesis = "genesis"
@@ -13,11 +19,6 @@ const (
flagValHash = "validator-set"
flagSelect = "select"
flagTags = "tag"
flagAny = "any"
flagBind = "bind"
flagCORS = "cors"
)
var (
@@ -28,19 +29,13 @@ var (
}
)
// 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) {
// AddCommands adds a number of rpc-related subcommands
func AddCommands(cmd *cobra.Command) {
cmd.AddCommand(
initClientCommand(),
statusCmd,
blockCommand(),
validatorCommand(),
lineBreak,
txSearchCommand(),
txCommand(),
lineBreak,
)
}
@@ -76,35 +71,3 @@ func validatorCommand() *cobra.Command {
}
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
}
client/tx/root.go
+45
View File
@@ -0,0 +1,45 @@
package tx
import (
"errors"
"github.com/spf13/cobra"
)
const (
flagTags = "tag"
flagAny = "any"
)
// XXX: remove this when not needed
func todoNotImplemented(_ *cobra.Command, _ []string) error {
return errors.New("TODO: Command not yet implemented")
}
// AddCommands adds a number of tx-query related subcommands
func AddCommands(cmd *cobra.Command) {
cmd.AddCommand(
txSearchCommand(),
txCommand(),
)
}
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
+12 -8
View File
@@ -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,
)