d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-05-13 23:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Config: Check asset type when obtaining pair format

Browse Source
This commit is contained in:
Adrian Gallagher
2019-06-27 13:58:12 +10:00
parent 6de0606d55
commit 7dbfcb311c
10 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/config.go
View File

@@ -652,6 +652,16 @@ func (c *Config) GetPairFormat(exchName string, assetType asset.Item) (currency.
return currency.PairFormat{}, err
}
supports, err := c.SupportsExchangeAssetType(exchName, assetType)
if err != nil {
return currency.PairFormat{}, err
}
if !supports {
return currency.PairFormat{},
fmt.Errorf("exchange %s does not support asset type %v", exchName, assetType)
}
if exchCfg.CurrencyPairs == nil {
return currency.PairFormat{}, errors.New("exchange currency pairs type is nil")
}

10
engine/helpers.go
View File

@@ -590,24 +590,22 @@ func SeedExchangeAccountInfo(data []exchange.AccountInfo) {
func GetCryptocurrenciesByExchange(exchangeName string, enabledExchangesOnly, enabledPairs bool, assetType asset.Item) ([]string, error) {
var cryptocurrencies []string
for x := range Bot.Config.Exchanges {
if Bot.Config.Exchanges[x].Name != exchangeName {
if !strings.EqualFold(Bot.Config.Exchanges[x].Name, exchangeName) {
continue
}
if enabledExchangesOnly && !Bot.Config.Exchanges[x].Enabled {
continue
}
exchName := Bot.Config.Exchanges[x].Name
var pairs []currency.Pair
var err error
var pairs []currency.Pair
if enabledPairs {
pairs, err = Bot.Config.GetEnabledPairs(exchName, assetType)
pairs, err = Bot.Config.GetEnabledPairs(exchangeName, assetType)
if err != nil {
return nil, err
}
} else {
pairs, err = Bot.Config.GetAvailablePairs(exchName, assetType)
pairs, err = Bot.Config.GetAvailablePairs(exchangeName, assetType)
if err != nil {
return nil, err
}

1
exchanges/bitfinex/bitfinex_wrapper.go
View File

@@ -88,6 +88,7 @@ func (b *Bitfinex) SetDefaults() {
b.API.Endpoints.URLDefault = bitfinexAPIURLBase
b.API.Endpoints.URL = b.API.Endpoints.URLDefault
b.API.Endpoints.WebsocketURL = bitfinexWebsocket
b.WebsocketInit()
b.Websocket.Functionality = exchange.WebsocketTickerSupported |
exchange.WebsocketTradeDataSupported |

1
exchanges/bitmex/bitmex_wrapper.go
View File

@@ -111,6 +111,7 @@ func (b *Bitmex) SetDefaults() {
b.API.Endpoints.URLDefault = bitmexAPIURL
b.API.Endpoints.URL = b.API.Endpoints.URLDefault
b.API.Endpoints.WebsocketURL = bitmexWSURL
b.WebsocketInit()
b.Websocket.Functionality = exchange.WebsocketTradeDataSupported |
exchange.WebsocketOrderbookSupported |

1
exchanges/coinbasepro/coinbasepro_wrapper.go
View File

@@ -88,6 +88,7 @@ func (c *CoinbasePro) SetDefaults() {
c.API.Endpoints.URLDefault = coinbaseproAPIURL
c.API.Endpoints.URL = c.API.Endpoints.URLDefault
c.API.Endpoints.WebsocketURL = coinbaseproWebsocketURL
c.WebsocketInit()
c.Websocket.Functionality = exchange.WebsocketTickerSupported |
exchange.WebsocketOrderbookSupported |

1
exchanges/coinut/coinut_wrapper.go
View File

@@ -85,6 +85,7 @@ func (c *COINUT) SetDefaults() {
c.API.Endpoints.URLDefault = coinutAPIURL
c.API.Endpoints.URL = c.API.Endpoints.URLDefault
c.API.Endpoints.WebsocketURL = coinutWebsocketURL
c.WebsocketInit()
c.Websocket.Functionality = exchange.WebsocketTickerSupported |
exchange.WebsocketOrderbookSupported |

1
exchanges/hitbtc/hitbtc_wrapper.go
View File

@@ -87,6 +87,7 @@ func (h *HitBTC) SetDefaults() {
h.API.Endpoints.URLDefault = apiURL
h.API.Endpoints.URL = h.API.Endpoints.URLDefault
h.API.Endpoints.WebsocketURL = hitbtcWebsocketAddress
h.WebsocketInit()
h.Websocket.Functionality = exchange.WebsocketTickerSupported |
exchange.WebsocketOrderbookSupported

1
exchanges/huobi/huobi_wrapper.go
View File

@@ -88,6 +88,7 @@ func (h *HUOBI) SetDefaults() {
h.API.Endpoints.URLDefault = huobiAPIURL
h.API.Endpoints.URL = h.API.Endpoints.URLDefault
h.API.Endpoints.WebsocketURL = wsMarketURL
h.WebsocketInit()
h.Websocket.Functionality = exchange.WebsocketKlineSupported |
exchange.WebsocketOrderbookSupported |

1
exchanges/poloniex/poloniex_wrapper.go
View File

@@ -87,6 +87,7 @@ func (p *Poloniex) SetDefaults() {
p.API.Endpoints.URLDefault = poloniexAPIURL
p.API.Endpoints.URL = p.API.Endpoints.URLDefault
p.API.Endpoints.WebsocketURL = poloniexWebsocketAddress
p.WebsocketInit()
p.Websocket.Functionality = exchange.WebsocketTradeDataSupported |
exchange.WebsocketOrderbookSupported |

1
exchanges/zb/zb_wrapper.go
View File

@@ -90,6 +90,7 @@ func (z *ZB) SetDefaults() {
z.API.Endpoints.URL = z.API.Endpoints.URLDefault
z.API.Endpoints.URLSecondaryDefault = zbMarketURL
z.API.Endpoints.URLSecondary = z.API.Endpoints.URLSecondaryDefault
z.API.Endpoints.WebsocketURL = zbWebsocketAPI
z.WebsocketInit()
z.Websocket.Functionality = exchange.WebsocketTickerSupported |
exchange.WebsocketOrderbookSupported |