melekes change request

cmd/tendermint/commands/replay.go

@@ -9,7 +9,7 @@ import (
 )
 
 var replayCmd = &cobra.Command{
-	Use:   "replay",
+	Use:   "replay [walfile]",
 	Short: "Replay messages from WAL",
 	Run: func(cmd *cobra.Command, args []string) {
 
@@ -22,7 +22,7 @@ var replayCmd = &cobra.Command{
 }
 
 var replayConsoleCmd = &cobra.Command{
-	Use:   "replay_console",
+	Use:   "replay_console [walfile]",
 	Short: "Replay messages from WAL in a console",
 	Run: func(cmd *cobra.Command, args []string) {
 

cmd/tendermint/commands/root.go

@@ -11,22 +11,8 @@ import (
 var config cfg.Config
 var log = logger.New("module", "main")
 
-//global flags
+//global flag
-var (
+var logLevel string
-	printHelp     bool
-	moniker       string
-	nodeLaddr     string
-	seeds         string
-	fastSync      bool
-	skipUPNP      bool
-	rpcLaddr      string
-	grpcLaddr     string
-	logLevel      string
-	proxyApp      string
-	abciTransport string
-
-	pex bool
-)
 
 var RootCmd = &cobra.Command{
 	Use:   "tendermint",
@@ -38,38 +24,9 @@ func init() {
 	// Get configuration
 	config = tmcfg.GetConfig("")
 
-	/////////////////////
+	//parse flag and set config
-	// parse flags
-
-	// configuration options
-	RootCmd.PersistentFlags().StringVar(&moniker, "moniker", config.GetString("moniker"), "Node Name")
-	RootCmd.PersistentFlags().StringVar(&nodeLaddr, "node_laddr", config.GetString("node_laddr"), "Node listen address. (0.0.0.0:0 means any interface, any port)")
-	RootCmd.PersistentFlags().StringVar(&seeds, "seeds", config.GetString("seeds"), "Comma delimited host:port seed nodes")
-	RootCmd.PersistentFlags().BoolVar(&fastSync, "fast_sync", config.GetBool("fast_sync"), "Fast blockchain syncing")
-	RootCmd.PersistentFlags().BoolVar(&skipUPNP, "skip_upnp", config.GetBool("skip_upnp"), "Skip UPNP configuration")
-	RootCmd.PersistentFlags().StringVar(&rpcLaddr, "rpc_laddr", config.GetString("rpc_laddr"), "RPC listen address. Port required")
-	RootCmd.PersistentFlags().StringVar(&grpcLaddr, "grpc_laddr", config.GetString("grpc_laddr"), "GRPC listen address (BroadcastTx only). Port required")
 	RootCmd.PersistentFlags().StringVar(&logLevel, "log_level", config.GetString("log_level"), "Log level")
-	RootCmd.PersistentFlags().StringVar(&proxyApp, "proxy_app", config.GetString("proxy_app"), "Proxy app address, or 'nilapp' or 'dummy' for local testing.")
-	RootCmd.PersistentFlags().StringVar(&abciTransport, "abci", config.GetString("abci"), "Specify abci transport (socket | grpc)")
-
-	// feature flags
-	RootCmd.PersistentFlags().BoolVar(&pex, "pex", config.GetBool("pex_reactor"), "Enable Peer-Exchange (dev feature)")
-
-	//------------------
-
-	// Merge parsed flag values onto config
-	config.Set("moniker", moniker)
-	config.Set("node_laddr", nodeLaddr)
-	config.Set("seeds", seeds)
-	config.Set("fast_sync", fastSync)
-	config.Set("skip_upnp", skipUPNP)
-	config.Set("rpc_laddr", rpcLaddr)
-	config.Set("grpc_laddr", grpcLaddr)
 	config.Set("log_level", logLevel)
-	config.Set("proxy_app", proxyApp)
-	config.Set("abci", abciTransport)
-	config.Set("pex_reactor", pex)
 
 	// set the log level
 	logger.SetLogLevel(config.GetString("log_level"))

cmd/tendermint/commands/run_node.go

@@ -17,7 +17,49 @@ var runNodeCmd = &cobra.Command{
 	Run:   runNode,
 }
 
+//flags
+var (
+	printHelp     bool
+	moniker       string
+	nodeLaddr     string
+	seeds         string
+	fastSync      bool
+	skipUPNP      bool
+	rpcLaddr      string
+	grpcLaddr     string
+	proxyApp      string
+	abciTransport string
+	pex           bool
+)
+
 func init() {
+
+	// configuration options
+	RootCmd.Flags().StringVar(&moniker, "moniker", config.GetString("moniker"), "Node Name")
+	RootCmd.Flags().StringVar(&nodeLaddr, "node_laddr", config.GetString("node_laddr"), "Node listen address. (0.0.0.0:0 means any interface, any port)")
+	RootCmd.Flags().StringVar(&seeds, "seeds", config.GetString("seeds"), "Comma delimited host:port seed nodes")
+	RootCmd.Flags().BoolVar(&fastSync, "fast_sync", config.GetBool("fast_sync"), "Fast blockchain syncing")
+	RootCmd.Flags().BoolVar(&skipUPNP, "skip_upnp", config.GetBool("skip_upnp"), "Skip UPNP configuration")
+	RootCmd.Flags().StringVar(&rpcLaddr, "rpc_laddr", config.GetString("rpc_laddr"), "RPC listen address. Port required")
+	RootCmd.Flags().StringVar(&grpcLaddr, "grpc_laddr", config.GetString("grpc_laddr"), "GRPC listen address (BroadcastTx only). Port required")
+	RootCmd.Flags().StringVar(&proxyApp, "proxy_app", config.GetString("proxy_app"), "Proxy app address, or 'nilapp' or 'dummy' for local testing.")
+	RootCmd.Flags().StringVar(&abciTransport, "abci", config.GetString("abci"), "Specify abci transport (socket | grpc)")
+
+	// feature flags
+	RootCmd.Flags().BoolVar(&pex, "pex", config.GetBool("pex_reactor"), "Enable Peer-Exchange (dev feature)")
+
+	// Merge parsed flag values onto config
+	config.Set("moniker", moniker)
+	config.Set("node_laddr", nodeLaddr)
+	config.Set("seeds", seeds)
+	config.Set("fast_sync", fastSync)
+	config.Set("skip_upnp", skipUPNP)
+	config.Set("rpc_laddr", rpcLaddr)
+	config.Set("grpc_laddr", grpcLaddr)
+	config.Set("proxy_app", proxyApp)
+	config.Set("abci", abciTransport)
+	config.Set("pex_reactor", pex)
+
 	RootCmd.AddCommand(runNodeCmd)
 }