fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-29 04:31:44 +00:00
Code Issues Projects Releases Wiki Activity

prettify the command helpers

Browse Source
This commit is contained in:
Zach Ramsay
2018-01-01 16:21:36 +00:00
parent 70da70d852
commit 47d5fd0f1b
1 changed files with 64 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
cmd/abci-cli/abci-cli.go
View File

@ -54,8 +54,8 @@ var (
var RootCmd = &cobra.Command{ var RootCmd = &cobra.Command{
Use: "abci-cli", Use: "abci-cli",
Short: "", Short: "the ABCI CLI tool wraps an ABCI client",
Long: "", Long: "the ABCI CLI tool wraps an ABCI client and is used for testing ABCI servers",
PersistentPreRunE: func(cmd *cobra.Command, args []string) error { PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
switch cmd.Use { switch cmd.Use {
@ -111,26 +111,26 @@ func Execute() error {
} }
func addGlobalFlags() { func addGlobalFlags() {
RootCmd.PersistentFlags().StringVarP(&flagAddress, "address", "", "tcp://0.0.0.0:46658", "Address of application socket") RootCmd.PersistentFlags().StringVarP(&flagAddress, "address", "", "tcp://0.0.0.0:46658", "address of application socket")
RootCmd.PersistentFlags().StringVarP(&flagAbci, "abci", "", "socket", "Either socket or grpc") RootCmd.PersistentFlags().StringVarP(&flagAbci, "abci", "", "socket", "either socket or grpc")
RootCmd.PersistentFlags().BoolVarP(&flagVerbose, "verbose", "v", false, "Print the command and results as if it were a console session") RootCmd.PersistentFlags().BoolVarP(&flagVerbose, "verbose", "v", false, "print the command and results as if it were a console session")
RootCmd.PersistentFlags().StringVarP(&flagLogLevel, "log_level", "", "debug", "Set the logger level") RootCmd.PersistentFlags().StringVarP(&flagLogLevel, "log_level", "", "debug", "set the logger level")
} }
func addQueryFlags() { func addQueryFlags() {
queryCmd.PersistentFlags().StringVarP(&flagPath, "path", "", "/store", "Path to prefix query with") queryCmd.PersistentFlags().StringVarP(&flagPath, "path", "", "/store", "path to prefix query with")
queryCmd.PersistentFlags().IntVarP(&flagHeight, "height", "", 0, "Height to query the blockchain at") queryCmd.PersistentFlags().IntVarP(&flagHeight, "height", "", 0, "height to query the blockchain at")
queryCmd.PersistentFlags().BoolVarP(&flagProve, "prove", "", false, "Whether or not to return a merkle proof of the query result") queryCmd.PersistentFlags().BoolVarP(&flagProve, "prove", "", false, "whether or not to return a merkle proof of the query result")
} }
func addCounterFlags() { func addCounterFlags() {
counterCmd.PersistentFlags().StringVarP(&flagAddrC, "addr", "", "tcp://0.0.0.0:46658", "Listen address") counterCmd.PersistentFlags().StringVarP(&flagAddrC, "addr", "", "tcp://0.0.0.0:46658", "listen address")
counterCmd.PersistentFlags().BoolVarP(&flagSerial, "serial", "", false, "Enforce incrementing (serial) transactions") counterCmd.PersistentFlags().BoolVarP(&flagSerial, "serial", "", false, "enforce incrementing (serial) transactions")
} }
func addDummyFlags() { func addDummyFlags() {
dummyCmd.PersistentFlags().StringVarP(&flagAddrD, "addr", "", "tcp://0.0.0.0:46658", "Listen address") dummyCmd.PersistentFlags().StringVarP(&flagAddrD, "addr", "", "tcp://0.0.0.0:46658", "listen address")
dummyCmd.PersistentFlags().StringVarP(&flagPersist, "persist", "", "", "Directory to use for a database") dummyCmd.PersistentFlags().StringVarP(&flagPersist, "persist", "", "", "directory to use for a database")
} }
func addCommands() { func addCommands() {
RootCmd.AddCommand(batchCmd) RootCmd.AddCommand(batchCmd)
@ -155,18 +155,39 @@ func addCommands() {
var batchCmd = &cobra.Command{ var batchCmd = &cobra.Command{
Use: "batch", Use: "batch",
Short: "Run a batch of abci commands against an application", Short: "run a batch of abci commands against an application",
Long: "", Long: `run a batch of abci commands against an application
Args: cobra.ExactArgs(0),
This command is run by piping in a file containing a series of commands
you'd like to run:
abci-cli batch < example.file
where example.file looks something like:
set_option serial on
check_tx 0x00
check_tx 0xff
deliver_tx 0x00
check_tx 0x00
deliver_tx 0x01
deliver_tx 0x04
info
`,
Args: cobra.ExactArgs(0),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
return cmdBatch(cmd, args) return cmdBatch(cmd, args)
}, },
} }
var consoleCmd = &cobra.Command{ var consoleCmd = &cobra.Command{
Use: "console", Use: "console",
Short: "Start an interactive abci console for multiple commands", Short: "start an interactive ABCI console for multiple commands",
Long: "", Long: `start an interactive ABCI console for multiple commands
This command opens an interactive console for running any of the other commands
without opening a new connection each time
`,
Args: cobra.ExactArgs(0), Args: cobra.ExactArgs(0),
ValidArgs: []string{"echo", "info", "set_option", "deliver_tx", "check_tx", "commit", "query"}, ValidArgs: []string{"echo", "info", "set_option", "deliver_tx", "check_tx", "commit", "query"},
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
@ -176,8 +197,8 @@ var consoleCmd = &cobra.Command{
var echoCmd = &cobra.Command{ var echoCmd = &cobra.Command{
Use: "echo", Use: "echo",
Short: "Have the application echo a message", Short: "have the application echo a message",
Long: "", Long: "have the application echo a message",
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
return cmdEcho(cmd, args) return cmdEcho(cmd, args)
@ -185,8 +206,8 @@ var echoCmd = &cobra.Command{
} }
var infoCmd = &cobra.Command{ var infoCmd = &cobra.Command{
Use: "info", Use: "info",
Short: "Get some info about the application", Short: "get some info about the application",
Long: "", Long: "get some info about the application",
Args: cobra.ExactArgs(0), Args: cobra.ExactArgs(0),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
return cmdInfo(cmd, args) return cmdInfo(cmd, args)
@ -194,8 +215,8 @@ var infoCmd = &cobra.Command{
} }
var setOptionCmd = &cobra.Command{ var setOptionCmd = &cobra.Command{
Use: "set_option", Use: "set_option",
Short: "Set an option on the application", Short: "set an option on the application",
Long: "", Long: "set an option on the application",
Args: cobra.ExactArgs(2), Args: cobra.ExactArgs(2),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
return cmdSetOption(cmd, args) return cmdSetOption(cmd, args)
@ -204,8 +225,8 @@ var setOptionCmd = &cobra.Command{
var deliverTxCmd = &cobra.Command{ var deliverTxCmd = &cobra.Command{
Use: "deliver_tx", Use: "deliver_tx",
Short: "Deliver a new transaction to the application", Short: "deliver a new transaction to the application",
Long: "", Long: "deliver a new transaction to the application",
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
return cmdDeliverTx(cmd, args) return cmdDeliverTx(cmd, args)
@ -214,8 +235,8 @@ var deliverTxCmd = &cobra.Command{
var checkTxCmd = &cobra.Command{ var checkTxCmd = &cobra.Command{
Use: "check_tx", Use: "check_tx",
Short: "Validate a transaction", Short: "validate a transaction",
Long: "", Long: "validate a transaction",
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
return cmdCheckTx(cmd, args) return cmdCheckTx(cmd, args)
@ -224,8 +245,8 @@ var checkTxCmd = &cobra.Command{
var commitCmd = &cobra.Command{ var commitCmd = &cobra.Command{
Use: "commit", Use: "commit",
Short: "Commit the application state and return the Merkle root hash", Short: "commit the application state and return the Merkle root hash",
Long: "", Long: "commit the application state and return the Merkle root hash",
Args: cobra.ExactArgs(0), Args: cobra.ExactArgs(0),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
return cmdCommit(cmd, args) return cmdCommit(cmd, args)
@ -234,8 +255,8 @@ var commitCmd = &cobra.Command{
var versionCmd = &cobra.Command{ var versionCmd = &cobra.Command{
Use: "version", Use: "version",
Short: "Print abci console version", Short: "print ABCI console version",
Long: "", Long: "print ABCI console version",
Args: cobra.ExactArgs(0), Args: cobra.ExactArgs(0),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
fmt.Println(version.Version) fmt.Println(version.Version)
@ -245,8 +266,8 @@ var versionCmd = &cobra.Command{
var queryCmd = &cobra.Command{ var queryCmd = &cobra.Command{
Use: "query", Use: "query",
Short: "Query the application state", Short: "query the application state",
Long: "", Long: "query the application state",
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
return cmdQuery(cmd, args) return cmdQuery(cmd, args)
@ -256,7 +277,7 @@ var queryCmd = &cobra.Command{
var counterCmd = &cobra.Command{ var counterCmd = &cobra.Command{
Use: "counter", Use: "counter",
Short: "ABCI demo example", Short: "ABCI demo example",
Long: "", Long: "ABCI demo example",
Args: cobra.ExactArgs(0), Args: cobra.ExactArgs(0),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
return cmdCounter(cmd, args) return cmdCounter(cmd, args)
@ -266,7 +287,7 @@ var counterCmd = &cobra.Command{
var dummyCmd = &cobra.Command{ var dummyCmd = &cobra.Command{
Use: "dummy", Use: "dummy",
Short: "ABCI demo example", Short: "ABCI demo example",
Long: "", Long: "ABCI demo example",
Args: cobra.ExactArgs(0), Args: cobra.ExactArgs(0),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
return cmdDummy(cmd, args) return cmdDummy(cmd, args)
@ -275,8 +296,8 @@ var dummyCmd = &cobra.Command{
var testCmd = &cobra.Command{ var testCmd = &cobra.Command{
Use: "test", Use: "test",
Short: "Run integration tests", Short: "run integration tests",
Long: "", Long: "run integration tests",
Args: cobra.ExactArgs(0), Args: cobra.ExactArgs(0),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
return cmdTest(cmd, args) return cmdTest(cmd, args)
@ -327,8 +348,10 @@ func cmdTest(cmd *cobra.Command, args []string) error {
func() error { return servertest.DeliverTx(client, []byte{0x00, 0x02}, code.CodeTypeOK, nil) }, func() error { return servertest.DeliverTx(client, []byte{0x00, 0x02}, code.CodeTypeOK, nil) },
func() error { return servertest.DeliverTx(client, []byte{0x00, 0x03}, code.CodeTypeOK, nil) }, func() error { return servertest.DeliverTx(client, []byte{0x00, 0x03}, code.CodeTypeOK, nil) },
func() error { return servertest.DeliverTx(client, []byte{0x00, 0x00, 0x04}, code.CodeTypeOK, nil) }, func() error { return servertest.DeliverTx(client, []byte{0x00, 0x00, 0x04}, code.CodeTypeOK, nil) },
func() error { return servertest.DeliverTx(client, []byte{0x00, 0x00, 0x06}, code.CodeTypeBadNonce, nil) }, func() error {
func() error { return servertest.Commit(client, []byte{0, 0, 0, 0, 0, 0, 0, 5})}, return servertest.DeliverTx(client, []byte{0x00, 0x00, 0x06}, code.CodeTypeBadNonce, nil)
},
func() error { return servertest.Commit(client, []byte{0, 0, 0, 0, 0, 0, 0, 5}) },
}) })
} }