aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-01-30 03:41:10 +0800
committerobscuren <geffobscura@gmail.com>2015-01-30 03:41:10 +0800
commitbd992e7baf5da01e97fe4e0c85184716daafa7e5 (patch)
treed159e9d44c6a9b90497d01ba8663865d3f7c8b98 /cmd
parent0031f388ac1f6f4a23c5c75e5eeb4a007f0b2f31 (diff)
parent447bad9dbd9ef033332b1166f7ac95aab5b82e43 (diff)
downloaddexon-bd992e7baf5da01e97fe4e0c85184716daafa7e5.tar
dexon-bd992e7baf5da01e97fe4e0c85184716daafa7e5.tar.gz
dexon-bd992e7baf5da01e97fe4e0c85184716daafa7e5.tar.bz2
dexon-bd992e7baf5da01e97fe4e0c85184716daafa7e5.tar.lz
dexon-bd992e7baf5da01e97fe4e0c85184716daafa7e5.tar.xz
dexon-bd992e7baf5da01e97fe4e0c85184716daafa7e5.tar.zst
dexon-bd992e7baf5da01e97fe4e0c85184716daafa7e5.zip
Merge branch 'qt5.4' of github.com-obscure:ethereum/go-ethereum into qt5.4
Conflicts: rpc/message.go
Diffstat (limited to 'cmd')
-rw-r--r--cmd/utils/cmd.go3
1 files changed, 0 insertions, 3 deletions
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index 1d4655433..43ad88c55 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -41,7 +41,6 @@ import (
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/websocket"
"github.com/ethereum/go-ethereum/xeth"
)
@@ -205,8 +204,6 @@ func StartRpc(ethereum *eth.Ethereum, RpcPort int) {
func StartWebSockets(eth *eth.Ethereum, wsPort int) {
clilogger.Infoln("Starting WebSockets")
- // sock := websocket.NewWebSocketServer(eth)
- // go sock.Serv()
var err error
eth.WsServer, err = rpcws.NewWebSocketServer(eth, wsPort)
if err != nil {