diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ethereum/flags.go | 3 | ||||
| -rw-r--r-- | cmd/ethereum/main.go | 4 | ||||
| -rw-r--r-- | cmd/mist/flags.go | 4 | ||||
| -rw-r--r-- | cmd/mist/main.go | 4 | ||||
| -rw-r--r-- | cmd/utils/cmd.go | 13 |
5 files changed, 0 insertions, 28 deletions
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go index 356571a23..46a63d849 100644 --- a/cmd/ethereum/flags.go +++ b/cmd/ethereum/flags.go @@ -46,7 +46,6 @@ var ( StartWebSockets bool RpcListenAddress string RpcPort int - WsPort int OutboundPort string ShowGenesis bool AddPeer string @@ -98,9 +97,7 @@ func Init() { 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", false, "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)") diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index f79f948d1..ff306b10f 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -128,10 +128,6 @@ func main() { utils.StartRpc(ethereum, RpcListenAddress, RpcPort) } - if StartWebSockets { - utils.StartWebSockets(ethereum, WsPort) - } - utils.StartEthereum(ethereum) fmt.Printf("Welcome to the FRONTIER\n") diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go index 1ffeb1915..095defc38 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 @@ -82,9 +80,7 @@ func Init() { flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file (db)") 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)") 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) { diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 5c7ec3221..723cfa887 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -35,7 +35,6 @@ import ( "github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/rlp" rpchttp "github.com/ethereum/go-ethereum/rpc/http" - rpcws "github.com/ethereum/go-ethereum/rpc/ws" "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/xeth" ) @@ -170,18 +169,6 @@ func StartRpc(ethereum *eth.Ethereum, RpcListenAddress string, RpcPort int) { } } -func StartWebSockets(eth *eth.Ethereum, wsPort int) { - clilogger.Infoln("Starting WebSockets") - - var err error - eth.WsServer, err = rpcws.NewWebSocketServer(xeth.New(eth), wsPort) - if err != nil { - clilogger.Errorf("Could not start RPC interface (port %v): %v", wsPort, err) - } else { - go eth.WsServer.Start() - } -} - var gminer *miner.Miner func GetMiner() *miner.Miner { |