aboutsummaryrefslogtreecommitdiffstats
path: root/websocket
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-01-06 18:44:22 +0800
committerobscuren <geffobscura@gmail.com>2015-01-06 18:44:22 +0800
commita26aecdfdb0223b2fb54ca2d40adb2b531512d42 (patch)
tree4bc8e01cbd36d831734be23d9433ea7446ea761e /websocket
parent47e6b2cef8ee0164e82d119c6a9359b55259d645 (diff)
downloaddexon-a26aecdfdb0223b2fb54ca2d40adb2b531512d42.tar.gz
dexon-a26aecdfdb0223b2fb54ca2d40adb2b531512d42.tar.zst
dexon-a26aecdfdb0223b2fb54ca2d40adb2b531512d42.zip
Updated WS API. Fixes #219. Closes #220
Diffstat (limited to 'websocket')
-rw-r--r--websocket/client.go6
-rw-r--r--websocket/message.go2
-rw-r--r--websocket/server.go2
3 files changed, 3 insertions, 7 deletions
diff --git a/websocket/client.go b/websocket/client.go
index d961816e8..db2c8e5c9 100644
--- a/websocket/client.go
+++ b/websocket/client.go
@@ -50,8 +50,8 @@ func (c *Client) Conn() *ws.Conn {
return c.ws
}
-func (c *Client) Write(data interface{}, seed int) {
- msg := &Message{Seed: seed, Data: data}
+func (c *Client) Write(data interface{}, id int) {
+ msg := &Message{Id: id, Data: data}
select {
case c.ch <- msg:
default:
@@ -73,7 +73,6 @@ func (c *Client) Listen() {
// Listen write request via chanel
func (c *Client) listenWrite() {
- wslogger.Debugln("Listening write to client")
for {
select {
@@ -93,7 +92,6 @@ func (c *Client) listenWrite() {
// Listen read request via chanel
func (c *Client) listenRead() {
- wslogger.Debugln("Listening read from client")
for {
select {
diff --git a/websocket/message.go b/websocket/message.go
index 67289c4c4..73b47456f 100644
--- a/websocket/message.go
+++ b/websocket/message.go
@@ -5,7 +5,7 @@ import "github.com/ethereum/go-ethereum/ethutil"
type Message struct {
Call string `json:"call"`
Args []interface{} `json:"args"`
- Seed int `json:"seed"`
+ Id int `json:"_id"`
Data interface{} `json:"data"`
}
diff --git a/websocket/server.go b/websocket/server.go
index 5fd923a0c..b0658b1b4 100644
--- a/websocket/server.go
+++ b/websocket/server.go
@@ -81,8 +81,6 @@ func (s *Server) MessageFunc(f MsgFunc) {
// Listen and serve.
// It serves client connection and broadcast request.
func (s *Server) Listen() {
- wslogger.Debugln("Listening server...")
-
// ws handler
onConnected := func(ws *ws.Conn) {
defer func() {