gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'qt5.4' of github.com-obscure:ethereum/go-ethereum into qt5.4

Browse Source 
Conflicts:
	rpc/message.go
This commit is contained in:
obscuren
2015-01-29 20:41:10 +01:00
parent 0031f388ac 447bad9dbd
commit bd992e7baf
10 changed files with 45 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/utils/cmd.go
View File

@ -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 {