mirror of
https://github.com/d0zingcat/gocryptotrader.git
synced 2026-05-29 23:16:51 +00:00
Engine: Protocol Features, coverage, types, BTC markets websocket (#368)
* 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:
@@ -27,11 +27,11 @@ func TestSetup(t *testing.T) {
|
||||
cfg := config.GetConfig()
|
||||
err := cfg.LoadConfig("../../testdata/configtest.json", true)
|
||||
if err != nil {
|
||||
log.Fatal("Test Failed - BTSE load config error", err)
|
||||
log.Fatal("BTSE load config error", err)
|
||||
}
|
||||
btseConfig, err := cfg.GetExchangeConfig("BTSE")
|
||||
if err != nil {
|
||||
t.Error("Test Failed - BTSE Setup() init error")
|
||||
t.Error("BTSE Setup() init error")
|
||||
}
|
||||
|
||||
btseConfig.API.AuthenticatedSupport = true
|
||||
@@ -40,7 +40,7 @@ func TestSetup(t *testing.T) {
|
||||
|
||||
err = b.Setup(btseConfig)
|
||||
if err != nil {
|
||||
t.Fatal("Test Failed - BTSE setup error", err)
|
||||
t.Fatal("BTSE setup error", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ func TestGetMarkets(t *testing.T) {
|
||||
b.SetDefaults()
|
||||
_, err := b.GetMarkets()
|
||||
if err != nil {
|
||||
t.Fatalf("Test failed. Err: %s", err)
|
||||
t.Fatalf("Err: %s", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ func TestGetTrades(t *testing.T) {
|
||||
b.SetDefaults()
|
||||
_, err := b.GetTrades("BTC-USD")
|
||||
if err != nil {
|
||||
t.Fatalf("Test failed. Err: %s", err)
|
||||
t.Fatalf("Err: %s", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ func TestGetTicker(t *testing.T) {
|
||||
b.SetDefaults()
|
||||
_, err := b.GetTicker("BTC-USD")
|
||||
if err != nil {
|
||||
t.Fatalf("Test failed. Err: %s", err)
|
||||
t.Fatalf("Err: %s", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ func TestGetOrderbook(t *testing.T) {
|
||||
b.SetDefaults()
|
||||
_, err := b.GetOrderbook("BTC-USD", 0, 0, 0)
|
||||
if err != nil {
|
||||
t.Fatalf("Test failed. Err: %s", err)
|
||||
t.Fatalf("Err: %s", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ func TestGetMarketStatistics(t *testing.T) {
|
||||
b.SetDefaults()
|
||||
_, err := b.GetMarketStatistics("BTC-USD")
|
||||
if err != nil {
|
||||
t.Fatalf("Test failed. Err: %s", err)
|
||||
t.Fatalf("Err: %s", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@ func TestGetServerTime(t *testing.T) {
|
||||
b.SetDefaults()
|
||||
_, err := b.GetServerTime()
|
||||
if err != nil {
|
||||
t.Fatalf("Test failed. Err: %s", err)
|
||||
t.Fatalf("Err: %s", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -142,7 +142,7 @@ func TestGetOrderHistory(t *testing.T) {
|
||||
|
||||
_, err := b.GetOrderHistory(&getOrdersRequest)
|
||||
if err != common.ErrFunctionNotSupported {
|
||||
t.Fatal("Test failed. Expected different result")
|
||||
t.Fatal("Expected different result")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -188,49 +188,49 @@ func TestGetFee(t *testing.T) {
|
||||
}
|
||||
|
||||
if resp, err := b.GetFee(feeBuilder); resp != 0.00050 || err != nil {
|
||||
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", 0.00050, resp)
|
||||
t.Errorf("GetFee() error. Expected: %f, Received: %f", 0.00050, resp)
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
feeBuilder.IsMaker = false
|
||||
if resp, err := b.GetFee(feeBuilder); resp != 0.0015 || err != nil {
|
||||
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", 0.0015, resp)
|
||||
t.Errorf("GetFee() error. Expected: %f, Received: %f", 0.0015, resp)
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
feeBuilder.FeeType = exchange.CryptocurrencyWithdrawalFee
|
||||
if resp, err := b.GetFee(feeBuilder); resp != 0.0005 || err != nil {
|
||||
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", 0.0005, resp)
|
||||
t.Errorf("GetFee() error. Expected: %f, Received: %f", 0.0005, resp)
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
feeBuilder.Pair.Base = currency.USDT
|
||||
if resp, err := b.GetFee(feeBuilder); resp != float64(5) || err != nil {
|
||||
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(5), resp)
|
||||
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(5), resp)
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
feeBuilder.FeeType = exchange.InternationalBankDepositFee
|
||||
if resp, err := b.GetFee(feeBuilder); resp != float64(3) || err != nil {
|
||||
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(3), resp)
|
||||
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(3), resp)
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
feeBuilder.Amount = 1000000
|
||||
if resp, err := b.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)
|
||||
}
|
||||
|
||||
feeBuilder.FeeType = exchange.InternationalBankWithdrawalFee
|
||||
if resp, err := b.GetFee(feeBuilder); resp != float64(1000) || err != nil {
|
||||
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(1000), resp)
|
||||
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(1000), resp)
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
feeBuilder.Amount = 1000
|
||||
if resp, err := b.GetFee(feeBuilder); resp != float64(25) || err != nil {
|
||||
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(25), resp)
|
||||
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(25), resp)
|
||||
t.Error(err)
|
||||
}
|
||||
}
|
||||
@@ -239,7 +239,7 @@ func TestParseOrderTime(t *testing.T) {
|
||||
expected := int64(1534794360)
|
||||
actual := parseOrderTime("2018-08-20 19:20:46").Unix()
|
||||
if expected != actual {
|
||||
t.Errorf("Test Failed. TestParseOrderTime expected: %d, got %d", expected, actual)
|
||||
t.Errorf("TestParseOrderTime expected: %d, got %d", expected, actual)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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,8 +70,28 @@ func (b *BTSE) SetDefaults() {
|
||||
Supports: exchange.FeaturesSupported{
|
||||
REST: true,
|
||||
Websocket: true,
|
||||
RESTCapabilities: exchange.ProtocolFeatures{
|
||||
AutoPairUpdates: true,
|
||||
RESTCapabilities: protocol.Features{
|
||||
TickerFetching: true,
|
||||
KlineFetching: true,
|
||||
TradeFetching: true,
|
||||
OrderbookFetching: true,
|
||||
AutoPairUpdates: true,
|
||||
AccountInfo: true,
|
||||
GetOrder: true,
|
||||
GetOrders: true,
|
||||
CancelOrders: true,
|
||||
CancelOrder: true,
|
||||
SubmitOrder: true,
|
||||
TradeFee: true,
|
||||
FiatDepositFee: true,
|
||||
FiatWithdrawalFee: true,
|
||||
CryptoWithdrawalFee: true,
|
||||
},
|
||||
WebsocketCapabilities: protocol.Features{
|
||||
TickerFetching: true,
|
||||
OrderbookFetching: true,
|
||||
Subscribe: true,
|
||||
Unsubscribe: true,
|
||||
},
|
||||
WithdrawPermissions: exchange.NoAPIWithdrawalMethods,
|
||||
},
|
||||
@@ -87,10 +108,6 @@ func (b *BTSE) SetDefaults() {
|
||||
b.API.Endpoints.URLDefault = btseAPIURL
|
||||
b.API.Endpoints.URL = b.API.Endpoints.URLDefault
|
||||
b.Websocket = wshandler.New()
|
||||
b.Websocket.Functionality = wshandler.WebsocketOrderbookSupported |
|
||||
wshandler.WebsocketTickerSupported |
|
||||
wshandler.WebsocketSubscribeSupported |
|
||||
wshandler.WebsocketUnsubscribeSupported
|
||||
b.WebsocketResponseMaxLimit = exchange.DefaultWebsocketResponseMaxLimit
|
||||
b.WebsocketResponseCheckTimeout = exchange.DefaultWebsocketResponseCheckTimeout
|
||||
b.WebsocketOrderbookBufferLimit = exchange.DefaultWebsocketOrderbookBufferLimit
|
||||
@@ -121,6 +138,7 @@ func (b *BTSE) Setup(exch *config.ExchangeConfig) error {
|
||||
Connector: b.WsConnect,
|
||||
Subscriber: b.Subscribe,
|
||||
UnSubscriber: b.Unsubscribe,
|
||||
Features: &b.Features.Supports.WebsocketCapabilities,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
Reference in New Issue
Block a user