Merge branch 'develop' of github.com:tgerring/go-ethereum into develop

This commit is contained in:
Taylor Gerring
2015-02-04 10:58:18 -06:00
5 changed files with 45 additions and 45 deletions

View File

@ -205,7 +205,7 @@ func StartWebSockets(eth *eth.Ethereum, wsPort int) {
clilogger.Infoln("Starting WebSockets")
var err error
eth.WsServer, err = rpcws.NewWebSocketServer(eth, wsPort)
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 {