RanchiMall/blockbook
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

currencyRates: make websocket "currency" arguments case-insensitive, like in REST API

Browse Source
This commit is contained in:
Vladyslav Burzakovskyy 2020-01-08 15:45:48 +01:00 committed by Martin
parent acaebd41c0
commit 29af6eb34d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/websocket.go
View File

@ -10,6 +10,7 @@ import (
"net/http" "net/http"
"runtime/debug" "runtime/debug"
"strconv" "strconv"
"strings"
"sync" "sync"
"sync/atomic" "sync/atomic"
"time" "time"
@ -283,9 +284,9 @@ var requestHandlers = map[string]func(*WebsocketServer, *websocketChannel, *webs
if r.GroupBy <= 0 { if r.GroupBy <= 0 {
r.GroupBy = 3600 r.GroupBy = 3600
} }
rv, err = s.api.GetXpubBalanceHistory(r.Descriptor, fromTime, toTime, r.Fiat, r.Gap, r.GroupBy) rv, err = s.api.GetXpubBalanceHistory(r.Descriptor, fromTime, toTime, strings.ToLower(r.Fiat), r.Gap, r.GroupBy)
if err != nil { if err != nil {
rv, err = s.api.GetBalanceHistory(r.Descriptor, fromTime, toTime, r.Fiat, r.GroupBy) rv, err = s.api.GetBalanceHistory(r.Descriptor, fromTime, toTime, strings.ToLower(r.Fiat), r.GroupBy)
} }
} }
return return
@ -347,7 +348,7 @@ var requestHandlers = map[string]func(*WebsocketServer, *websocketChannel, *webs
if err != nil { if err != nil {
return nil, err return nil, err
} }
return s.subscribeFiatRates(c, r.Currency, req) return s.subscribeFiatRates(c, strings.ToLower(r.Currency), req)
}, },
"unsubscribeFiatRates": func(s *WebsocketServer, c *websocketChannel, req *websocketReq) (rv interface{}, err error) { "unsubscribeFiatRates": func(s *WebsocketServer, c *websocketChannel, req *websocketReq) (rv interface{}, err error) {
return s.unsubscribeFiatRates(c) return s.unsubscribeFiatRates(c)
@ -362,7 +363,7 @@ var requestHandlers = map[string]func(*WebsocketServer, *websocketChannel, *webs
}{} }{}
err = json.Unmarshal(req.Params, &r) err = json.Unmarshal(req.Params, &r)
if err == nil { if err == nil {
rv, err = s.getCurrentFiatRates(r.Currency) rv, err = s.getCurrentFiatRates(strings.ToLower(r.Currency))
} }
return return
}, },
@ -373,7 +374,7 @@ var requestHandlers = map[string]func(*WebsocketServer, *websocketChannel, *webs
}{} }{}
err = json.Unmarshal(req.Params, &r) err = json.Unmarshal(req.Params, &r)
if err == nil { if err == nil {
rv, err = s.getFiatRatesForTimestamps(r.Timestamps, r.Currency) rv, err = s.getFiatRatesForTimestamps(r.Timestamps, strings.ToLower(r.Currency))
} }
return return
}, },