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

Engine: Protocol Features, coverage, types, BTC markets websocket (#368)

Browse Source 
* Attempts to update orderbook so it doesn't need to sort

* Reverts the ws ob stuff. Gets rid of sorting because it happens later. Adds some exchange features

* update existing feature lists. Expands list definition to match my emotions

* Adds bithumb bitmex and bitstamp. adds a couple more types

* Features for you, features for me, features for bittrex, btcmarkets, btse, coinbasepro, coinut, exmo, gateio and gemini

* Features for hitbtc, huobi, itbit, kraken, lakebtc, lbank, localbitcoins, okcoin, okex, poloniex, yobit, zb

* Who can forget good old alphapoint?

* Adds btcmarksets websocket :glitch_crab: fixes alphapoint features

* Adds extra data not in the documentation :/

* Replaces websocket features by using protocol features. However, it breaks it due to import cycles. I'm not sure what I'll do just yet

* Removes import cycle via duplicate structs.

* Increases coverage of config with `TestCheckCurrencyConfigValues`. Moves all currency pair package types into their own files or places it at the bottom of files if necessary

* Increase coverage in code.go

* One way of determining a test has failed, is when to it fails. Removed redundant explanation

* Increases code coverage of conversion

* Lint fixes

* Fixes orderbook tests

* Re-adds sorting because its important to still have the internal pre-processed orderbook to be representative of a real orderbook

* Secret lints that did not show up via Windows linting

* Adds protocol package to contain exchange features

* Fixes protocol implementation

* Fixes ws tests

* Addresses the following: Removes st-st-stutters in config types, changes GetAvailableForexProviders -> GetSupportedForexProviders, removes errors from tests where error is nil, removes orderbook setup when not necessary, removes import newlines, removes false bools from declaration, changes should of to should have

* imports and casing

* Fixes two more nil error checks
This commit is contained in:
Scott
2019-10-22 10:56:20 +11:00
committed by Adrian Gallagher
parent ec0ed1c1e5
commit ccfcdf26aa
156 changed files with 5228 additions and 4337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
exchanges/zb/zb_test.go
View File

@@ -31,11 +31,11 @@ func TestSetup(t *testing.T) {
cfg := config.GetConfig()
err := cfg.LoadConfig("../../testdata/configtest.json", true)
if err != nil {
t.Fatal("Test Failed - ZB load config error", err)
t.Fatal("ZB load config error", err)
}
zbConfig, err := cfg.GetExchangeConfig("ZB")
if err != nil {
t.Fatal("Test Failed - ZB Setup() init error", err)
t.Fatal("ZB Setup() init error", err)
}
zbConfig.API.AuthenticatedSupport = true
zbConfig.API.AuthenticatedWebsocketSupport = true
@@ -44,7 +44,7 @@ func TestSetup(t *testing.T) {
err = z.Setup(zbConfig)
if err != nil {
t.Fatal("Test Failed - ZB setup error", err)
t.Fatal("ZB setup error", err)
}
}
@@ -90,7 +90,7 @@ func TestSpotNewOrder(t *testing.T) {
}
orderid, err := z.SpotNewOrder(arg)
if err != nil {
t.Errorf("Test failed - ZB SpotNewOrder: %s", err)
t.Errorf("ZB SpotNewOrder: %s", err)
} else {
t.Log(orderid)
}
@@ -105,7 +105,7 @@ func TestCancelExistingOrder(t *testing.T) {
err := z.CancelExistingOrder(20180629145864850, "btc_usdt")
if err != nil {
t.Errorf("Test failed - ZB CancelExistingOrder: %s", err)
t.Errorf("ZB CancelExistingOrder: %s", err)
}
}
@@ -113,7 +113,7 @@ func TestGetLatestSpotPrice(t *testing.T) {
t.Parallel()
_, err := z.GetLatestSpotPrice("btc_usdt")
if err != nil {
t.Errorf("Test failed - ZB GetLatestSpotPrice: %s", err)
t.Errorf("ZB GetLatestSpotPrice: %s", err)
}
}
@@ -121,7 +121,7 @@ func TestGetTicker(t *testing.T) {
t.Parallel()
_, err := z.GetTicker("btc_usdt")
if err != nil {
t.Errorf("Test failed - ZB GetTicker: %s", err)
t.Errorf("ZB GetTicker: %s", err)
}
}
@@ -129,7 +129,7 @@ func TestGetTickers(t *testing.T) {
t.Parallel()
_, err := z.GetTickers()
if err != nil {
t.Errorf("Test failed - ZB GetTicker: %s", err)
t.Errorf("ZB GetTicker: %s", err)
}
}
@@ -137,7 +137,7 @@ func TestGetOrderbook(t *testing.T) {
t.Parallel()
_, err := z.GetOrderbook("btc_usdt")
if err != nil {
t.Errorf("Test failed - ZB GetTicker: %s", err)
t.Errorf("ZB GetTicker: %s", err)
}
}
@@ -145,7 +145,7 @@ func TestGetMarkets(t *testing.T) {
t.Parallel()
_, err := z.GetMarkets()
if err != nil {
t.Errorf("Test failed - ZB GetMarkets: %s", err)
t.Errorf("ZB GetMarkets: %s", err)
}
}
@@ -159,7 +159,7 @@ func TestGetSpotKline(t *testing.T) {
}
_, err := z.GetSpotKline(arg)
if err != nil {
t.Errorf("Test failed - ZB GetSpotKline: %s", err)
t.Errorf("ZB GetSpotKline: %s", err)
}
}
@@ -199,7 +199,7 @@ func TestGetFee(t *testing.T) {
// CryptocurrencyTradeFee Basic
if resp, err := z.GetFee(feeBuilder); resp != float64(0.002) || err != nil {
t.Error(err)
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(0.0015), resp)
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(0.0015), resp)
}
// CryptocurrencyTradeFee High quantity
@@ -207,7 +207,7 @@ func TestGetFee(t *testing.T) {
feeBuilder.Amount = 1000
feeBuilder.PurchasePrice = 1000
if resp, err := z.GetFee(feeBuilder); resp != float64(2000) || err != nil {
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(2000), resp)
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(2000), resp)
t.Error(err)
}
@@ -215,7 +215,7 @@ func TestGetFee(t *testing.T) {
feeBuilder = setFeeBuilder()
feeBuilder.IsMaker = true
if resp, err := z.GetFee(feeBuilder); resp != float64(0.002) || err != nil {
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(0.002), resp)
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(0.002), resp)
t.Error(err)
}
@@ -223,14 +223,14 @@ func TestGetFee(t *testing.T) {
feeBuilder = setFeeBuilder()
feeBuilder.PurchasePrice = -1000
if resp, err := z.GetFee(feeBuilder); resp != float64(0) || err != nil {
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(0), resp)
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(0), resp)
t.Error(err)
}
// CryptocurrencyWithdrawalFee Basic
feeBuilder = setFeeBuilder()
feeBuilder.FeeType = exchange.CryptocurrencyWithdrawalFee
if resp, err := z.GetFee(feeBuilder); resp != float64(0.005) || err != nil {
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(0.005), resp)
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(0.005), resp)
t.Error(err)
}
@@ -239,7 +239,7 @@ func TestGetFee(t *testing.T) {
feeBuilder.Pair.Base = currency.NewCode("hello")
feeBuilder.FeeType = exchange.CryptocurrencyWithdrawalFee
if resp, err := z.GetFee(feeBuilder); resp != float64(0) || err != nil {
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(0), resp)
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(0), resp)
t.Error(err)
}
@@ -247,7 +247,7 @@ func TestGetFee(t *testing.T) {
feeBuilder = setFeeBuilder()
feeBuilder.FeeType = exchange.CyptocurrencyDepositFee
if resp, err := z.GetFee(feeBuilder); resp != float64(0) || err != nil {
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(0), resp)
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(0), resp)
t.Error(err)
}
@@ -255,7 +255,7 @@ func TestGetFee(t *testing.T) {
feeBuilder = setFeeBuilder()
feeBuilder.FeeType = exchange.InternationalBankDepositFee
if resp, err := z.GetFee(feeBuilder); resp != float64(0) || err != nil {
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(0), resp)
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(0), resp)
t.Error(err)
}
@@ -264,7 +264,7 @@ func TestGetFee(t *testing.T) {
feeBuilder.FeeType = exchange.InternationalBankWithdrawalFee
feeBuilder.FiatCurrency = currency.USD
if resp, err := z.GetFee(feeBuilder); resp != float64(0) || err != nil {
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(0), resp)
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(0), resp)
t.Error(err)
}
}
@@ -413,12 +413,12 @@ func TestGetAccountInfo(t *testing.T) {
if z.ValidateAPICredentials() {
_, err := z.GetAccountInfo()
if err != nil {
t.Error("Test Failed - GetAccountInfo() error", err)
t.Error("GetAccountInfo() error", err)
}
} else {
_, err := z.GetAccountInfo()
if err == nil {
t.Error("Test Failed - GetAccountInfo() error")
t.Error("GetAccountInfo() Expected error")
}
}
}
@@ -426,7 +426,7 @@ func TestGetAccountInfo(t *testing.T) {
func TestModifyOrder(t *testing.T) {
_, err := z.ModifyOrder(&exchange.ModifyOrder{})
if err == nil {
t.Error("Test failed - ModifyOrder() error")
t.Error("ModifyOrder() Expected error")
}
}
@@ -490,13 +490,13 @@ func TestGetDepositAddress(t *testing.T) {
if apiKey != "" || apiSecret != "" {
_, err := z.GetDepositAddress(currency.BTC, "")
if err != nil {
t.Error("Test Failed - GetDepositAddress() error PLEASE MAKE SURE YOU CREATE DEPOSIT ADDRESSES VIA ZB.COM",
t.Error("GetDepositAddress() error PLEASE MAKE SURE YOU CREATE DEPOSIT ADDRESSES VIA ZB.COM",
err)
}
} else {
_, err := z.GetDepositAddress(currency.BTC, "")
if err == nil {
t.Error("Test Failed - GetDepositAddress() error")
t.Error("GetDepositAddress() Expected error")
}
}
}

40
exchanges/zb/zb_wrapper.go
View File

@@ -13,6 +13,7 @@ import (
exchange "github.com/thrasher-corp/gocryptotrader/exchanges"
"github.com/thrasher-corp/gocryptotrader/exchanges/asset"
"github.com/thrasher-corp/gocryptotrader/exchanges/orderbook"
"github.com/thrasher-corp/gocryptotrader/exchanges/protocol"
"github.com/thrasher-corp/gocryptotrader/exchanges/request"
"github.com/thrasher-corp/gocryptotrader/exchanges/ticker"
"github.com/thrasher-corp/gocryptotrader/exchanges/websocket/wshandler"
@@ -69,9 +70,32 @@ func (z *ZB) SetDefaults() {
Supports: exchange.FeaturesSupported{
REST: true,
Websocket: true,
RESTCapabilities: exchange.ProtocolFeatures{
AutoPairUpdates: true,
TickerBatching: true,
RESTCapabilities: protocol.Features{
TickerBatching: true,
TickerFetching: true,
KlineFetching: true,
OrderbookFetching: true,
AutoPairUpdates: true,
AccountInfo: true,
GetOrder: true,
GetOrders: true,
CancelOrder: true,
CryptoDeposit: true,
CryptoWithdrawal: true,
TradeFee: true,
CryptoDepositFee: true,
CryptoWithdrawalFee: true,
},
WebsocketCapabilities: protocol.Features{
TickerFetching: true,
TradeFetching: true,
OrderbookFetching: true,
Subscribe: true,
AuthenticatedEndpoints: true,
AccountInfo: true,
CancelOrder: true,
SubmitOrder: true,
MessageCorrelation: true,
},
WithdrawPermissions: exchange.AutoWithdrawCrypto |
exchange.NoFiatWithdrawals,
@@ -92,15 +116,6 @@ func (z *ZB) SetDefaults() {
z.API.Endpoints.URLSecondary = z.API.Endpoints.URLSecondaryDefault
z.API.Endpoints.WebsocketURL = zbWebsocketAPI
z.Websocket = wshandler.New()
z.Websocket.Functionality = wshandler.WebsocketTickerSupported |
wshandler.WebsocketOrderbookSupported |
wshandler.WebsocketTradeDataSupported |
wshandler.WebsocketSubscribeSupported |
wshandler.WebsocketAuthenticatedEndpointsSupported |
wshandler.WebsocketAccountDataSupported |
wshandler.WebsocketCancelOrderSupported |
wshandler.WebsocketSubmitOrderSupported |
wshandler.WebsocketMessageCorrelationSupported
z.WebsocketResponseMaxLimit = exchange.DefaultWebsocketResponseMaxLimit
z.WebsocketResponseCheckTimeout = exchange.DefaultWebsocketResponseCheckTimeout
}
@@ -128,6 +143,7 @@ func (z *ZB) Setup(exch *config.ExchangeConfig) error {
RunningURL: exch.API.Endpoints.WebsocketURL,
Connector: z.WsConnect,
Subscriber: z.Subscribe,
Features: &z.Features.Supports.WebsocketCapabilities,
})
if err != nil {
return err