fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-05-28 05:31:20 +00:00
Code Issues Projects Releases Wiki Activity

cleanup run_node flags

Browse Source
This commit is contained in:
Ethan Buchman 2017-05-02 03:51:36 -04:00
parent 92bafa7ecd
commit f217f2b2c5
2 changed files with 22 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/tendermint/commands/root.go
View File

@ -17,8 +17,6 @@ var (
func init() { func init() {
viperConfig = cfg.GetConfig("") viperConfig = cfg.GetConfig("")
config = node.NewDefaultConfig("")
} }
// unmarshal viper into the Tendermint config // unmarshal viper into the Tendermint config
@ -38,6 +36,6 @@ var RootCmd = &cobra.Command{
func init() { func init() {
//parse flag and set config //parse flag and set config
RootCmd.PersistentFlags().String("log_level", config.LogLevel, "Log level") RootCmd.PersistentFlags().String("log_level", viperConfig.GetString("log_level"), "Log level")
viperConfig.BindPFlag("log_level", RootCmd.PersistentFlags().Lookup("log_level")) viperConfig.BindPFlag("log_level", RootCmd.PersistentFlags().Lookup("log_level"))
} }

59
cmd/tendermint/commands/run_node.go
View File

@ -7,7 +7,6 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
//cfg "github.com/tendermint/tendermint/config/tendermint"
"github.com/tendermint/tendermint/node" "github.com/tendermint/tendermint/node"
"github.com/tendermint/tendermint/types" "github.com/tendermint/tendermint/types"
cmn "github.com/tendermint/tmlibs/common" cmn "github.com/tendermint/tmlibs/common"
@ -19,53 +18,38 @@ var runNodeCmd = &cobra.Command{
RunE: runNode, RunE: runNode,
} }
func registerRunNodeFlagString(flagName, desc string) {
runNodeCmd.Flags().String(flagName, viperConfig.GetString(flagName), desc)
viperConfig.BindPFlag(flagName, runNodeCmd.Flags().Lookup(flagName))
}
func registerRunNodeFlagBool(flagName, desc string) {
runNodeCmd.Flags().Bool(flagName, viperConfig.GetBool(flagName), desc)
viperConfig.BindPFlag(flagName, runNodeCmd.Flags().Lookup(flagName))
}
func init() { func init() {
// bind flags // bind flags
// node flags // node flags
runNodeCmd.Flags().String("moniker", config.Moniker, registerRunNodeFlagString("moniker", "Node Name")
"Node Name") registerRunNodeFlagBool("fast_sync", "Fast blockchain syncing")
viperConfig.BindPFlag("moniker", runNodeCmd.Flags().Lookup("moniker"))
runNodeCmd.Flags().Bool("fast_sync", config.FastSync,
"Fast blockchain syncing")
viperConfig.BindPFlag("fast_sync", runNodeCmd.Flags().Lookup("fast_sync"))
// abci flags // abci flags
runNodeCmd.Flags().String("proxy_app", config.ProxyApp, registerRunNodeFlagString("proxy_app", "Proxy app address, or 'nilapp' or 'dummy' for local testing.")
"Proxy app address, or 'nilapp' or 'dummy' for local testing.") registerRunNodeFlagString("abci", "Specify abci transport (socket | grpc)")
viperConfig.BindPFlag("proxy_app", runNodeCmd.Flags().Lookup("proxy_app"))
runNodeCmd.Flags().String("abci", config.ABCI,
"Specify abci transport (socket | grpc)")
viperConfig.BindPFlag("abci", runNodeCmd.Flags().Lookup("abci"))
// rpc flags // rpc flags
runNodeCmd.Flags().String("rpc_laddr", config.RPCListenAddress, registerRunNodeFlagString("rpc_laddr", "RPC listen address. Port required")
"RPC listen address. Port required") registerRunNodeFlagString("grpc_laddr", "GRPC listen address (BroadcastTx only). Port required")
viperConfig.BindPFlag("rpc_laddr", runNodeCmd.Flags().Lookup("rpc_laddr"))
runNodeCmd.Flags().String("grpc_laddr", config.GRPCListenAddress,
"GRPC listen address (BroadcastTx only). Port required")
viperConfig.BindPFlag("grpc_laddr", runNodeCmd.Flags().Lookup("grpc_laddr"))
// p2p flags // p2p flags
runNodeCmd.Flags().String("p2p.laddr", config.P2P.ListenAddress, registerRunNodeFlagString("p2p.laddr", "Node listen address. (0.0.0.0:0 means any interface, any port)")
"Node listen address. (0.0.0.0:0 means any interface, any port)") registerRunNodeFlagString("p2p.seeds", "Comma delimited host:port seed nodes")
viperConfig.BindPFlag("p2p.laddr", runNodeCmd.Flags().Lookup("p2p.laddr")) registerRunNodeFlagBool("p2p.skip_upnp", "Skip UPNP configuration")
runNodeCmd.Flags().String("p2p.seeds", config.P2P.Seeds,
"Comma delimited host:port seed nodes")
viperConfig.BindPFlag("p2p.seeds", runNodeCmd.Flags().Lookup("p2p.seeds"))
runNodeCmd.Flags().Bool("p2p.skip_upnp", config.P2P.SkipUPNP,
"Skip UPNP configuration")
viperConfig.BindPFlag("p2p.skip_upnp", runNodeCmd.Flags().Lookup("p2p.skip_upnp"))
// feature flags // feature flags
runNodeCmd.Flags().Bool("p2p.pex", config.P2P.PexReactor, registerRunNodeFlagBool("p2p.pex", "Enable Peer-Exchange (dev feature)")
"Enable Peer-Exchange (dev feature)")
viperConfig.BindPFlag("p2p.pex", runNodeCmd.Flags().Lookup("p2p.pex"))
RootCmd.AddCommand(runNodeCmd) RootCmd.AddCommand(runNodeCmd)
} }
@ -101,8 +85,7 @@ func runNode(cmd *cobra.Command, args []string) error {
if genDoc.ChainID == "" { if genDoc.ChainID == "" {
return fmt.Errorf("Genesis doc %v must include non-empty chain_id", genDocFile) return fmt.Errorf("Genesis doc %v must include non-empty chain_id", genDocFile)
} }
config.ChainID = genDoc.ChainID
// config.SetChainID("chain_id", genDoc.ChainID) TODO
} }
} }