Merge branch 'develop' into jsonrpc

3 files changed, 13 insertions, 10 deletions

diff --git a/websocket/client.go b/websocket/client.go
index d961816e8..340a67aea 100644
--- a/websocket/client.go
+++ b/websocket/client.go
@@ -50,8 +50,14 @@ 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) {
+	c.write(&Message{Id: id, Data: data})
+}
+func (c *Client) Event(data interface{}, ev string, id int) {
+	c.write(&Message{Id: id, Data: data, Event: ev})
+}
+
+func (c *Client) write(msg *Message) {
 	select {
 	case c.ch <- msg:
 	default:
@@ -73,7 +79,6 @@ func (c *Client) Listen() {
 
 // Listen write request via chanel
 func (c *Client) listenWrite() {
-	wslogger.Debugln("Listening write to client")
 	for {
 		select {
 
@@ -93,7 +98,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..cd2af5099 100644
--- a/websocket/message.go
+++ b/websocket/message.go
@@ -3,10 +3,11 @@ package websocket
 import "github.com/ethereum/go-ethereum/ethutil"
 
 type Message struct {
-	Call string        `json:"call"`
-	Args []interface{} `json:"args"`
-	Seed int           `json:"seed"`
-	Data interface{}   `json:"data"`
+	Call  string        `json:"call"`
+	Args  []interface{} `json:"args"`
+	Id    int           `json:"_id"`
+	Data  interface{}   `json:"data"`
+	Event string        `json:"_event"`
 }
 
 func (self *Message) Arguments() *ethutil.Value {
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() {