From cfe037028081ebb84ee35caa5b16fed5d125b58a Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Sun, 1 Mar 2015 16:19:06 +0100
Subject: Remove Websockets RPC transport
---
cmd/ethereum/flags.go | 3 ---
cmd/ethereum/main.go | 4 ----
cmd/mist/flags.go | 3 ---
cmd/mist/main.go | 4 ----
cmd/utils/cmd.go | 13 -------------
5 files changed, 27 deletions(-)
(limited to 'cmd')
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go
index 7d410c8e4..fd8aee90b 100644
--- a/cmd/ethereum/flags.go
+++ b/cmd/ethereum/flags.go
@@ -44,7 +44,6 @@ var (
StartRpc bool
StartWebSockets bool
RpcPort int
- WsPort int
OutboundPort string
ShowGenesis bool
AddPeer string
@@ -94,9 +93,7 @@ func Init() {
flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file (db)")
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 45e6f7b93..63585b0f5 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -131,10 +131,6 @@ func main() {
utils.StartRpc(ethereum, RpcPort)
}
- if StartWebSockets {
- utils.StartWebSockets(ethereum, WsPort)
- }
-
utils.StartEthereum(ethereum)
if StartJsConsole {
diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go
index 0010df826..06768657d 100644
--- a/cmd/mist/flags.go
+++ b/cmd/mist/flags.go
@@ -43,7 +43,6 @@ var (
StartRpc bool
StartWebSockets bool
RpcPort int
- WsPort int
OutboundPort string
ShowGenesis bool
AddPeer string
@@ -80,9 +79,7 @@ func Init() {
flag.StringVar(&KeyRing, "keyring", "", "identifier for keyring to use")
flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file (db)")
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 3abe16767..a330bbcb1 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -76,10 +76,6 @@ func run() error {
utils.StartRpc(ethereum, 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 a36c10e3b..20165fa97 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, 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 {
--
cgit v1.2.3