From b7f07a8ff5308e789d430d9f8fbec5fa8bd0be90 Mon Sep 17 00:00:00 2001
From: Jakub Matys <jakub.matys@satoshilabs.com>
Date: Tue, 13 Mar 2018 11:35:41 +0100
Subject: [PATCH] method map cleaned up because of metric labels

---
 server/socketio.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/socketio.go b/server/socketio.go
index 76d29447..9bca60e8 100644
--- a/server/socketio.go
+++ b/server/socketio.go
@@ -134,52 +134,52 @@ type reqRange struct {
 }
 
 var onMessageHandlers = map[string]func(*SocketIoServer, json.RawMessage) (interface{}, error){
-	"\"getAddressTxids\"": func(s *SocketIoServer, params json.RawMessage) (rv interface{}, err error) {
+	"getAddressTxids": func(s *SocketIoServer, params json.RawMessage) (rv interface{}, err error) {
 		addr, rr, err := unmarshalGetAddressRequest(params)
 		if err == nil {
 			rv, err = s.getAddressTxids(addr, &rr)
 		}
 		return
 	},
-	"\"getAddressHistory\"": func(s *SocketIoServer, params json.RawMessage) (rv interface{}, err error) {
+	"getAddressHistory": func(s *SocketIoServer, params json.RawMessage) (rv interface{}, err error) {
 		addr, rr, err := unmarshalGetAddressRequest(params)
 		if err == nil {
 			rv, err = s.getAddressHistory(addr, &rr)
 		}
 		return
 	},
-	"\"getBlockHeader\"": func(s *SocketIoServer, params json.RawMessage) (rv interface{}, err error) {
+	"getBlockHeader": func(s *SocketIoServer, params json.RawMessage) (rv interface{}, err error) {
 		height, hash, err := unmarshalGetBlockHeader(params)
 		if err == nil {
 			rv, err = s.getBlockHeader(height, hash)
 		}
 		return
 	},
-	"\"estimateSmartFee\"": func(s *SocketIoServer, params json.RawMessage) (rv interface{}, err error) {
+	"estimateSmartFee": func(s *SocketIoServer, params json.RawMessage) (rv interface{}, err error) {
 		blocks, conservative, err := unmarshalEstimateSmartFee(params)
 		if err == nil {
 			rv, err = s.estimateSmartFee(blocks, conservative)
 		}
 		return
 	},
-	"\"getInfo\"": func(s *SocketIoServer, params json.RawMessage) (rv interface{}, err error) {
+	"getInfo": func(s *SocketIoServer, params json.RawMessage) (rv interface{}, err error) {
 		return s.getInfo()
 	},
-	"\"getDetailedTransaction\"": func(s *SocketIoServer, params json.RawMessage) (rv interface{}, err error) {
+	"getDetailedTransaction": func(s *SocketIoServer, params json.RawMessage) (rv interface{}, err error) {
 		txid, err := unmarshalStringParameter(params)
 		if err == nil {
 			rv, err = s.getDetailedTransaction(txid)
 		}
 		return
 	},
-	"\"sendTransaction\"": func(s *SocketIoServer, params json.RawMessage) (rv interface{}, err error) {
+	"sendTransaction": func(s *SocketIoServer, params json.RawMessage) (rv interface{}, err error) {
 		tx, err := unmarshalStringParameter(params)
 		if err == nil {
 			rv, err = s.sendTransaction(tx)
 		}
 		return
 	},
-	"\"getMempoolEntry\"": func(s *SocketIoServer, params json.RawMessage) (rv interface{}, err error) {
+	"getMempoolEntry": func(s *SocketIoServer, params json.RawMessage) (rv interface{}, err error) {
 		txid, err := unmarshalStringParameter(params)
 		if err == nil {
 			rv, err = s.getMempoolEntry(txid)
@@ -197,8 +197,8 @@ type resultError struct {
 func (s *SocketIoServer) onMessage(c *gosocketio.Channel, req map[string]json.RawMessage) interface{} {
 	var err error
 	var rv interface{}
-	method := string(req["method"])
 	t := time.Now()
+	method := strings.Trim(string(req["method"]), "\"")
 	params := req["params"]
 	defer s.metrics.RequestDuration.With(common.Labels{"transport": "socketio", "method": method}).Observe(float64(time.Since(t)) / 1e3) // in microseconds
 	f, ok := onMessageHandlers[method]