From d50392b0d0b7fd08b5cb22088085112d2dac2c2b Mon Sep 17 00:00:00 2001 From: Martin Boehm Date: Wed, 7 Feb 2018 13:23:45 +0100 Subject: [PATCH] Fix return values from socket.io --- server/socketio.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/server/socketio.go b/server/socketio.go index 173f81cc..423c5a83 100644 --- a/server/socketio.go +++ b/server/socketio.go @@ -100,26 +100,22 @@ type reqRange struct { To int `json:"to"` } -func (s *SocketIoServer) onMessage(c *gosocketio.Channel, req map[string]json.RawMessage) string { +func (s *SocketIoServer) onMessage(c *gosocketio.Channel, req map[string]json.RawMessage) interface{} { var err error - var rv []byte - var rvi interface{} + var rv interface{} method := string(req["method"]) params := req["params"] if method == "\"getAddressTxids\"" { addr, rr, err := unmarshalGetAddressTxids(params) if err == nil { - rvi, err = s.getAddressTxids(addr, &rr) + rv, err = s.getAddressTxids(addr, &rr) } } else { err = errors.New("unknown method") } if err == nil { - rv, err = json.Marshal(rvi) - } - if err == nil { - glog.Info(c.Id(), " ", method, " success, returning ", len(rv), " bytes") - return string(rv) + glog.Info(c.Id(), " ", method, " success") + return rv } glog.Error(c.Id(), " ", method, ": ", err) return "" @@ -140,7 +136,7 @@ func unmarshalGetAddressTxids(params []byte) (addr []string, rr reqRange, err er } func (s *SocketIoServer) getAddressTxids(addr []string, rr *reqRange) ([]string, error) { - var txids []string + txids := make([]string, 0) lower, higher := uint32(rr.To), uint32(rr.Start) for _, address := range addr { script, err := bchain.AddressToOutputScript(address)