aboutsummaryrefslogtreecommitdiffstats
path: root/rpc/ws
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-01-29 02:01:15 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-01-29 02:01:15 +0800
commit21fd31dad8bc6e0291ca405314b516670333c707 (patch)
tree34aa6f6d0e1f5c7316f0220f6e0569f916307fa3 /rpc/ws
parenta88f609b8ab1e20eb2564d47605985d6b8f593e8 (diff)
parent872b2497114209119becf2e8a4d4a5818e2084ee (diff)
downloadgo-tangerine-21fd31dad8bc6e0291ca405314b516670333c707.tar.gz
go-tangerine-21fd31dad8bc6e0291ca405314b516670333c707.tar.zst
go-tangerine-21fd31dad8bc6e0291ca405314b516670333c707.zip
Merge branch 'jsonrpc' of github.com:ethereum/go-ethereum into jsonrpc
Diffstat (limited to 'rpc/ws')
-rw-r--r--rpc/ws/server.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/rpc/ws/server.go b/rpc/ws/server.go
index e2b918430..2efc6ff02 100644
--- a/rpc/ws/server.go
+++ b/rpc/ws/server.go
@@ -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)