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

This commit is contained in:
Taylor Gerring
2015-01-28 12:01:15 -06:00
27 changed files with 705 additions and 709 deletions

View File

@ -76,7 +76,7 @@ func (self *WebSocketServer) Start() {
wslogger.Infof("Starting RPC-WS server on port %d", self.port)
go self.handlerLoop()
api := rpc.NewEthereumApi(xeth.NewJSXEth(self.eth))
api := rpc.NewEthereumApi(xeth.New(self.eth))
h := self.apiHandler(api)
http.Handle("/ws", h)