diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-04 03:34:48 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-04 03:34:48 +0800 |
| commit | bb152612e0466164d33ff7f2023d804d7db18c01 (patch) | |
| tree | e4210c42c574e986fd886c753258b7d063597095 /cmd/mist | |
| parent | cfe3af099c7fb4b637132a5c0ab2b94569418084 (diff) | |
| parent | 253eb778d19af9204c9dd65e3963bd63f3bab6f0 (diff) | |
| download | go-tangerine-bb152612e0466164d33ff7f2023d804d7db18c01.tar go-tangerine-bb152612e0466164d33ff7f2023d804d7db18c01.tar.gz go-tangerine-bb152612e0466164d33ff7f2023d804d7db18c01.tar.bz2 go-tangerine-bb152612e0466164d33ff7f2023d804d7db18c01.tar.lz go-tangerine-bb152612e0466164d33ff7f2023d804d7db18c01.tar.xz go-tangerine-bb152612e0466164d33ff7f2023d804d7db18c01.tar.zst go-tangerine-bb152612e0466164d33ff7f2023d804d7db18c01.zip | |
Merge branch 'develop' into poc-9
Conflicts:
cmd/utils/cmd.go
Diffstat (limited to 'cmd/mist')
| -rw-r--r-- | cmd/mist/flags.go | 8 | ||||
| -rw-r--r-- | cmd/mist/main.go | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go index 1ffeb1915..139af5923 100644 --- a/cmd/mist/flags.go +++ b/cmd/mist/flags.go @@ -41,10 +41,8 @@ var ( KeyRing string KeyStore string StartRpc bool - StartWebSockets bool RpcListenAddress string RpcPort int - WsPort int OutboundPort string ShowGenesis bool AddPeer string @@ -79,12 +77,10 @@ func Init() { flag.IntVar(&VmType, "vm", 0, "Virtual Machine type: 0-1: standard, debug") flag.StringVar(&Identifier, "id", "", "Custom client identifier") flag.StringVar(&KeyRing, "keyring", "", "identifier for keyring to use") - flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file (db)") + flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file") flag.StringVar(&RpcListenAddress, "rpcaddr", "127.0.0.1", "address for json-rpc server to listen on") flag.IntVar(&RpcPort, "rpcport", 8545, "port to start json-rpc server on") - flag.IntVar(&WsPort, "wsport", 40404, "port to start websocket rpc server on") flag.BoolVar(&StartRpc, "rpc", true, "start rpc server") - flag.BoolVar(&StartWebSockets, "ws", false, "start websocket server") flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)") flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key") flag.StringVar(&SecretFile, "import", "", "imports the file given (hex or mnemonic formats)") @@ -93,7 +89,7 @@ func Init() { flag.StringVar(&Datadir, "datadir", ethutil.DefaultDataDir(), "specifies the datadir to use") flag.StringVar(&ConfigFile, "conf", defaultConfigFile, "config file") flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)") - flag.IntVar(&LogLevel, "loglevel", int(logger.InfoLevel), "loglevel: 0-5: silent,error,warn,info,debug,debug detail)") + flag.IntVar(&LogLevel, "loglevel", int(logger.InfoLevel), "loglevel: 0-5 (= silent,error,warn,info,debug,debug detail)") flag.StringVar(&AssetPath, "asset_path", ethutil.DefaultAssetPath(), "absolute path to GUI assets directory") diff --git a/cmd/mist/main.go b/cmd/mist/main.go index c9a07bfde..1d4403848 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -76,10 +76,6 @@ func run() error { utils.StartRpc(ethereum, RpcListenAddress, RpcPort) } - if StartWebSockets { - utils.StartWebSockets(ethereum, WsPort) - } - gui := NewWindow(ethereum, config, KeyRing, LogLevel) utils.RegisterInterrupt(func(os.Signal) { |