mirror of
https://github.com/d0zingcat/gocryptotrader.git
synced 2026-05-24 23:16:52 +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:
@@ -19,11 +19,11 @@ func TestMain(m *testing.M) {
|
||||
cfg := config.GetConfig()
|
||||
err := cfg.LoadConfig("../../testdata/configtest.json", true)
|
||||
if err != nil {
|
||||
log.Fatalf("Test Failed - ANX Setup() load config error: %s", err)
|
||||
log.Fatalf("ANX Setup() load config error: %s", err)
|
||||
}
|
||||
anxConfig, err := cfg.GetExchangeConfig("ANX")
|
||||
if err != nil {
|
||||
log.Fatalf("Test Failed - ANX Setup() init error: %s", err)
|
||||
log.Fatalf("ANX Setup() init error: %s", err)
|
||||
}
|
||||
anxConfig.API.AuthenticatedSupport = true
|
||||
anxConfig.API.Credentials.Key = apiKey
|
||||
@@ -31,7 +31,7 @@ func TestMain(m *testing.M) {
|
||||
a.SetDefaults()
|
||||
err = a.Setup(anxConfig)
|
||||
if err != nil {
|
||||
log.Fatal("Test Failed - ANX setup error", err)
|
||||
log.Fatal("ANX setup error", err)
|
||||
}
|
||||
log.Printf(sharedtestvalues.LiveTesting, a.GetName(), a.API.Endpoints.URL)
|
||||
os.Exit(m.Run())
|
||||
|
||||
@@ -22,11 +22,11 @@ func TestMain(m *testing.M) {
|
||||
cfg := config.GetConfig()
|
||||
err := cfg.LoadConfig("../../testdata/configtest.json", true)
|
||||
if err != nil {
|
||||
log.Fatal("Test Failed - ANX load config error", err)
|
||||
log.Fatal("ANX load config error", err)
|
||||
}
|
||||
anxConfig, err := cfg.GetExchangeConfig("ANX")
|
||||
if err != nil {
|
||||
log.Fatal("Test Failed - Mock server error", err)
|
||||
log.Fatal("Mock server error", err)
|
||||
}
|
||||
a.SkipAuthCheck = true
|
||||
anxConfig.API.AuthenticatedSupport = true
|
||||
@@ -35,12 +35,12 @@ func TestMain(m *testing.M) {
|
||||
a.SetDefaults()
|
||||
err = a.Setup(anxConfig)
|
||||
if err != nil {
|
||||
log.Fatal("Test Failed - ANX setup error", err)
|
||||
log.Fatal("ANX setup error", err)
|
||||
}
|
||||
|
||||
serverDetails, newClient, err := mock.NewVCRServer(mockFile)
|
||||
if err != nil {
|
||||
log.Fatalf("Test Failed - Mock server error %s", err)
|
||||
log.Fatalf("Mock server error %s", err)
|
||||
}
|
||||
|
||||
a.HTTPClient = newClient
|
||||
|
||||
@@ -22,7 +22,7 @@ func TestGetCurrencies(t *testing.T) {
|
||||
t.Parallel()
|
||||
_, err := a.GetCurrencies()
|
||||
if err != nil {
|
||||
t.Fatalf("Test failed. TestGetCurrencies failed. Err: %s", err)
|
||||
t.Fatalf("TestGetCurrencies failed. Err: %s", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ func TestGetTradablePairs(t *testing.T) {
|
||||
t.Parallel()
|
||||
_, err := a.FetchTradablePairs(asset.Spot)
|
||||
if err != nil {
|
||||
t.Fatalf("Test failed. TestGetTradablePairs failed. Err: %s", err)
|
||||
t.Fatalf("TestGetTradablePairs failed. Err: %s", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,10 +38,10 @@ func TestGetTicker(t *testing.T) {
|
||||
t.Parallel()
|
||||
ticker, err := a.GetTicker("BTCUSD")
|
||||
if err != nil {
|
||||
t.Errorf("Test Failed - ANX GetTicker() error: %s", err)
|
||||
t.Errorf("ANX GetTicker() error: %s", err)
|
||||
}
|
||||
if ticker.Result != "success" {
|
||||
t.Error("Test Failed - ANX GetTicker() unsuccessful")
|
||||
t.Error("ANX GetTicker() unsuccessful")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -49,10 +49,10 @@ func TestGetDepth(t *testing.T) {
|
||||
t.Parallel()
|
||||
depth, err := a.GetDepth("BTCUSD")
|
||||
if err != nil {
|
||||
t.Errorf("Test Failed - ANX GetDepth() error: %s", err)
|
||||
t.Errorf("ANX GetDepth() error: %s", err)
|
||||
}
|
||||
if depth.Result != "success" {
|
||||
t.Error("Test Failed - ANX GetDepth() unsuccessful")
|
||||
t.Error("ANX GetDepth() unsuccessful")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,13 +60,13 @@ func TestGetAPIKey(t *testing.T) {
|
||||
t.Parallel()
|
||||
apiKey, apiSecret, err := a.GetAPIKey("userName", "passWord", "", "1337")
|
||||
if err == nil {
|
||||
t.Error("Test Failed - ANX GetAPIKey() Incorrect")
|
||||
t.Error("ANX GetAPIKey() Expected error")
|
||||
}
|
||||
if apiKey != "" {
|
||||
t.Error("Test Failed - ANX GetAPIKey() Incorrect")
|
||||
t.Error("ANX GetAPIKey() Expected error")
|
||||
}
|
||||
if apiSecret != "" {
|
||||
t.Error("Test Failed - ANX GetAPIKey() Incorrect")
|
||||
t.Error("ANX GetAPIKey() Expected error")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -103,7 +103,7 @@ func TestGetFee(t *testing.T) {
|
||||
// CryptocurrencyTradeFee Basic
|
||||
if resp, err := a.GetFee(feeBuilder); resp != float64(0.02) || err != nil {
|
||||
t.Error(err)
|
||||
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(0), resp)
|
||||
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(0), resp)
|
||||
}
|
||||
|
||||
// CryptocurrencyTradeFee High quantity
|
||||
@@ -111,7 +111,7 @@ func TestGetFee(t *testing.T) {
|
||||
feeBuilder.Amount = 1000
|
||||
feeBuilder.PurchasePrice = 1000
|
||||
if resp, err := a.GetFee(feeBuilder); resp != float64(20000) || err != nil {
|
||||
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(20000), resp)
|
||||
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(20000), resp)
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
@@ -119,7 +119,7 @@ func TestGetFee(t *testing.T) {
|
||||
feeBuilder = setFeeBuilder()
|
||||
feeBuilder.IsMaker = true
|
||||
if resp, err := a.GetFee(feeBuilder); resp != float64(0.01) || err != nil {
|
||||
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(0.01), resp)
|
||||
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(0.01), resp)
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
@@ -127,7 +127,7 @@ func TestGetFee(t *testing.T) {
|
||||
feeBuilder = setFeeBuilder()
|
||||
feeBuilder.PurchasePrice = -1000
|
||||
if resp, err := a.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)
|
||||
}
|
||||
|
||||
@@ -135,7 +135,7 @@ func TestGetFee(t *testing.T) {
|
||||
feeBuilder = setFeeBuilder()
|
||||
feeBuilder.FeeType = exchange.CryptocurrencyWithdrawalFee
|
||||
if resp, err := a.GetFee(feeBuilder); resp != float64(0.002) || 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)
|
||||
}
|
||||
|
||||
@@ -143,7 +143,7 @@ func TestGetFee(t *testing.T) {
|
||||
feeBuilder = setFeeBuilder()
|
||||
feeBuilder.FeeType = exchange.CyptocurrencyDepositFee
|
||||
if resp, err := a.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)
|
||||
}
|
||||
|
||||
@@ -152,7 +152,7 @@ func TestGetFee(t *testing.T) {
|
||||
feeBuilder.FeeType = exchange.InternationalBankDepositFee
|
||||
feeBuilder.FiatCurrency = currency.HKD
|
||||
if resp, err := a.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)
|
||||
}
|
||||
|
||||
@@ -161,7 +161,7 @@ func TestGetFee(t *testing.T) {
|
||||
feeBuilder.FeeType = exchange.InternationalBankWithdrawalFee
|
||||
feeBuilder.FiatCurrency = currency.HKD
|
||||
if resp, err := a.GetFee(feeBuilder); resp != float64(250.01) || err != nil {
|
||||
t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(250.01), resp)
|
||||
t.Errorf("GetFee() error. Expected: %f, Received: %f", float64(250.01), resp)
|
||||
t.Error(err)
|
||||
}
|
||||
}
|
||||
@@ -208,7 +208,7 @@ func TestGetOrderHistory(t *testing.T) {
|
||||
case !areTestAPIKeysSet() && err == nil && !mockTests:
|
||||
t.Error("Expecting an error when no keys are set")
|
||||
case mockTests && err != nil:
|
||||
t.Error("Test Failed - GetBalance() error", err)
|
||||
t.Error("GetBalance() error", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -307,11 +307,11 @@ func TestGetAccountInfo(t *testing.T) {
|
||||
_, err := a.GetAccountInfo()
|
||||
switch {
|
||||
case areTestAPIKeysSet() && err != nil && !mockTests:
|
||||
t.Error("test failed - GetAccountInfo() error:", err)
|
||||
t.Error("GetAccountInfo() error:", err)
|
||||
case !areTestAPIKeysSet() && err == nil && !mockTests:
|
||||
t.Error("test failed - GetAccountInfo() error")
|
||||
t.Error("GetAccountInfo() error")
|
||||
case mockTests && err != nil:
|
||||
t.Error("test failed - GetAccountInfo() error:", err)
|
||||
t.Error("GetAccountInfo() error:", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -319,7 +319,7 @@ func TestModifyOrder(t *testing.T) {
|
||||
t.Parallel()
|
||||
_, err := a.ModifyOrder(&exchange.ModifyOrder{})
|
||||
if err == nil {
|
||||
t.Error("Test failed - ModifyOrder() error")
|
||||
t.Error("ModifyOrder() Expected error")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -373,9 +373,9 @@ func TestGetDepositAddress(t *testing.T) {
|
||||
t.Parallel()
|
||||
_, err := a.GetDepositAddress(currency.BTC, "")
|
||||
if areTestAPIKeysSet() && err != nil && !mockTests {
|
||||
t.Error("Test Failed - GetDepositAddress() error", err)
|
||||
t.Error("GetDepositAddress() error", err)
|
||||
} else if !areTestAPIKeysSet() && err == nil {
|
||||
t.Error("Test Failed - GetDepositAddress() error cannot be nil")
|
||||
t.Error("GetDepositAddress() error cannot be nil")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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"
|
||||
@@ -80,9 +81,24 @@ func (a *ANX) SetDefaults() {
|
||||
Supports: exchange.FeaturesSupported{
|
||||
REST: true,
|
||||
Websocket: false,
|
||||
RESTCapabilities: exchange.ProtocolFeatures{
|
||||
AutoPairUpdates: true,
|
||||
TickerBatching: false,
|
||||
RESTCapabilities: protocol.Features{
|
||||
TickerFetching: true,
|
||||
OrderbookFetching: true,
|
||||
AutoPairUpdates: true,
|
||||
AccountInfo: true,
|
||||
CryptoDeposit: true,
|
||||
CryptoWithdrawal: true,
|
||||
GetOrder: true,
|
||||
GetOrders: true,
|
||||
CancelOrders: true,
|
||||
CancelOrder: true,
|
||||
SubmitOrder: true,
|
||||
DepositHistory: true,
|
||||
WithdrawalHistory: true,
|
||||
UserTradeHistory: true,
|
||||
TradeFee: true,
|
||||
FiatWithdrawalFee: true,
|
||||
CryptoWithdrawalFee: true,
|
||||
},
|
||||
WithdrawPermissions: exchange.WithdrawCryptoWithEmail |
|
||||
exchange.AutoWithdrawCryptoWithSetup |
|
||||
|
||||
Reference in New Issue
Block a user