Split up common.go, file path fixes and much more

This commit is contained in:
Adrian Gallagher
2019-06-04 17:04:18 +10:00
parent 8c62316e82
commit e965e54e09
74 changed files with 524 additions and 617 deletions

View File

@@ -8,6 +8,7 @@ import (
"io/ioutil"
"net/http"
"net/url"
"strings"
"time"
"github.com/gorilla/websocket"
@@ -126,7 +127,7 @@ func (h *HUOBI) WsHandleData() {
}
switch {
case common.StringContains(init.Channel, "depth"):
case strings.Contains(init.Channel, "depth"):
var depth WsDepth
err := common.JSONDecode(resp.Raw, &depth)
if err != nil {
@@ -134,11 +135,11 @@ func (h *HUOBI) WsHandleData() {
continue
}
data := common.SplitStrings(depth.Channel, ".")
data := strings.Split(depth.Channel, ".")
h.WsProcessOrderbook(&depth, data[1])
case common.StringContains(init.Channel, "kline"):
case strings.Contains(init.Channel, "kline"):
var kline WsKline
err := common.JSONDecode(resp.Raw, &kline)
if err != nil {
@@ -146,7 +147,7 @@ func (h *HUOBI) WsHandleData() {
continue
}
data := common.SplitStrings(kline.Channel, ".")
data := strings.Split(kline.Channel, ".")
h.Websocket.DataHandler <- exchange.KlineData{
Timestamp: time.Unix(0, kline.Timestamp),
@@ -160,7 +161,7 @@ func (h *HUOBI) WsHandleData() {
Volume: kline.Tick.Volume,
}
case common.StringContains(init.Channel, "trade"):
case strings.Contains(init.Channel, "trade"):
var trade WsTrade
err := common.JSONDecode(resp.Raw, &trade)
if err != nil {
@@ -168,7 +169,7 @@ func (h *HUOBI) WsHandleData() {
continue
}
data := common.SplitStrings(trade.Channel, ".")
data := strings.Split(trade.Channel, ".")
h.Websocket.DataHandler <- exchange.TradeData{
Exchange: h.GetName(),

View File

@@ -390,7 +390,7 @@ func (h *HUOBI) SubmitOrder(p currency.Pair, side exchange.OrderSide, orderType
var params = SpotNewOrderRequestParams{
Amount: amount,
Source: "api",
Symbol: common.StringToLower(p.String()),
Symbol: strings.ToLower(p.String()),
AccountID: int(accountID),
}