Binance websocket fixes for #271 & #270 (#272)

* Fixes bug reported in #271 switch statement

* Time conversion fix for timestamp

* remove debug statement

* reverted back to CurrDayClose
This commit is contained in:
Andrew
2019-04-07 05:41:47 +10:00
committed by Adrian Gallagher
parent 8251fdd6ae
commit eeda97bbaf
2 changed files with 7 additions and 3 deletions

View File

@@ -94,6 +94,7 @@ func (b *Binance) SetDefaults() {
b.APIUrlDefault = apiURL
b.APIUrl = b.APIUrlDefault
b.WebsocketInit()
b.WebsocketURL = binanceDefaultWebsocketURL
b.Websocket.Functionality = exchange.WebsocketTradeDataSupported |
exchange.WebsocketTickerSupported |
exchange.WebsocketKlineSupported |
@@ -112,6 +113,7 @@ func (b *Binance) Setup(exch *config.ExchangeConfig) {
b.SetHTTPClientUserAgent(exch.HTTPUserAgent)
b.RESTPollingDelay = exch.RESTPollingDelay
b.Verbose = exch.Verbose
b.Websocket.SetWsStatusAndConnection(exch.Websocket)
b.BaseCurrencies = exch.BaseCurrencies
b.AvailablePairs = exch.AvailablePairs
b.EnabledPairs = exch.EnabledPairs

View File

@@ -185,6 +185,7 @@ func (b *Binance) WSConnect() error {
// WSReadData reads from the websocket connection and returns the response
func (b *Binance) WSReadData() (exchange.WebsocketResponse, error) {
msgType, resp, err := b.WebsocketConn.ReadMessage()
if err != nil {
return exchange.WebsocketResponse{}, err
}
@@ -226,8 +227,8 @@ func (b *Binance) WsHandleData() {
string(read.Raw))
continue
}
switch multiStreamData.Stream {
streamType := strings.Split(multiStreamData.Stream, "@")
switch streamType[1] {
case "trade":
trade := TradeStream{}
@@ -274,7 +275,7 @@ func (b *Binance) WsHandleData() {
var wsTicker exchange.TickerData
wsTicker.Timestamp = time.Unix(0, t.EventTime)
wsTicker.Timestamp = time.Unix(t.EventTime/1000, 0)
wsTicker.Pair = currency.NewPairFromString(t.Symbol)
wsTicker.AssetType = ticker.Spot
wsTicker.Exchange = b.GetName()
@@ -285,6 +286,7 @@ func (b *Binance) WsHandleData() {
wsTicker.LowPrice, _ = strconv.ParseFloat(t.LowPrice, 64)
b.Websocket.DataHandler <- wsTicker
continue
case "kline":
kline := KlineStream{}