aboutsummaryrefslogtreecommitdiffstats
path: root/rpc/ws
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-01-28 04:34:01 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-01-28 04:34:01 +0800
commite9d017ba082bfd624267c974fa93a77da6269756 (patch)
treee9d43020c0c7544969ab7e3906053ded947a7c33 /rpc/ws
parentd8c6168d11dda55ffb10bc70601e74e347c156e1 (diff)
downloadgo-tangerine-e9d017ba082bfd624267c974fa93a77da6269756.tar.gz
go-tangerine-e9d017ba082bfd624267c974fa93a77da6269756.tar.zst
go-tangerine-e9d017ba082bfd624267c974fa93a77da6269756.zip
Rename api var for clarity
Diffstat (limited to 'rpc/ws')
-rw-r--r--rpc/ws/server.go9
1 files changed, 4 insertions, 5 deletions
diff --git a/rpc/ws/server.go b/rpc/ws/server.go
index c275031f4..248ebc585 100644
--- a/rpc/ws/server.go
+++ b/rpc/ws/server.go
@@ -85,9 +85,9 @@ func (self *WebSocketServer) Start() {
}
}
-func (s *WebSocketServer) apiHandler(xeth *rpc.EthereumApi) http.Handler {
+func (s *WebSocketServer) apiHandler(api *rpc.EthereumApi) http.Handler {
fn := func(w http.ResponseWriter, req *http.Request) {
- h := sockHandler(xeth)
+ h := sockHandler(api)
s := websocket.Server{Handler: h}
s.ServeHTTP(w, req)
}
@@ -95,10 +95,9 @@ func (s *WebSocketServer) apiHandler(xeth *rpc.EthereumApi) http.Handler {
return http.HandlerFunc(fn)
}
-func sockHandler(xeth *rpc.EthereumApi) websocket.Handler {
+func sockHandler(api *rpc.EthereumApi) websocket.Handler {
fn := func(conn *websocket.Conn) {
for {
- // FIX wslogger does not output to console
wslogger.Debugln("Handling request")
var reqParsed rpc.RpcRequest
@@ -109,7 +108,7 @@ func sockHandler(xeth *rpc.EthereumApi) websocket.Handler {
}
var response interface{}
- reserr := xeth.GetRequestReply(&reqParsed, &response)
+ reserr := api.GetRequestReply(&reqParsed, &response)
if reserr != nil {
wslogger.Errorln(reserr)
websocket.JSON.Send(conn, rpc.RpcErrorResponse{JsonRpc: reqParsed.JsonRpc, ID: reqParsed.ID, Error: true, ErrorText: reserr.Error()})