Tests: Use currency.NewBTCUSD and NewBTCUSDT (#1895)

* Tests: Use currency.NewUSD and NewUSDT

Simple refactor to use the provided shortcut methods

* Github: Add CI check to ensure NewPair not used

Add a step to ensure NewPair(BTC, USD*) isn't used
This commit is contained in:
Gareth Kirwan
2025-05-07 03:32:06 +02:00
committed by GitHub
parent eda6015d73
commit 3caa149d8e
83 changed files with 555 additions and 542 deletions

View File

@@ -3326,7 +3326,7 @@ func TestUpdateOrderExecutionLimits(t *testing.T) {
tests := map[asset.Item][]currency.Pair{
asset.Spot: {
currency.NewPair(currency.ETH, currency.USDT),
currency.NewPair(currency.BTC, currency.USDT),
currency.NewBTCUSDT(),
},
asset.Margin: {
currency.NewPair(currency.ETH, currency.USDT),
@@ -3360,7 +3360,7 @@ func TestUpdateOrderExecutionLimits(t *testing.T) {
func TestUpdateTicker(t *testing.T) {
t.Parallel()
result, err := ok.UpdateTicker(contextGenerate(), currency.NewPair(currency.BTC, currency.USDT), asset.Spot)
result, err := ok.UpdateTicker(contextGenerate(), currency.NewBTCUSDT(), asset.Spot)
require.NoError(t, err)
assert.NotNil(t, result)
}
@@ -3410,10 +3410,10 @@ func TestGetWithdrawalsHistory(t *testing.T) {
func TestGetRecentTrades(t *testing.T) {
t.Parallel()
result, err := ok.GetRecentTrades(contextGenerate(), currency.NewPair(currency.BTC, currency.USDT), asset.PerpetualSwap)
result, err := ok.GetRecentTrades(contextGenerate(), currency.NewBTCUSDT(), asset.PerpetualSwap)
require.NoError(t, err)
require.NotNil(t, result)
result, err = ok.GetRecentTrades(contextGenerate(), currency.NewPair(currency.BTC, currency.USDT), asset.Spread)
result, err = ok.GetRecentTrades(contextGenerate(), currency.NewBTCUSDT(), asset.Spread)
require.NoError(t, err)
assert.NotNil(t, result)
}
@@ -3889,7 +3889,7 @@ func TestValidateAPICredentials(t *testing.T) {
func TestGetHistoricCandles(t *testing.T) {
t.Parallel()
pair := currency.NewPair(currency.BTC, currency.USDT)
pair := currency.NewBTCUSDT()
startTime := time.Date(2021, 2, 1, 0, 0, 0, 0, time.UTC)
endTime := startTime.AddDate(0, 0, 100)
_, err := ok.GetHistoricCandles(contextGenerate(), pair, asset.Spot, kline.Interval(time.Hour*4), startTime, endTime)
@@ -3902,7 +3902,7 @@ func TestGetHistoricCandles(t *testing.T) {
func TestGetHistoricCandlesExtended(t *testing.T) {
t.Parallel()
currencyPair := currency.NewPair(currency.BTC, currency.USDT)
currencyPair := currency.NewBTCUSDT()
result, err := ok.GetHistoricCandlesExtended(contextGenerate(), currencyPair, asset.Spot, kline.OneMin, time.Now().Add(-time.Hour), time.Now())
require.NoError(t, err)
assert.NotNil(t, result)
@@ -4046,7 +4046,7 @@ func TestPushDataDynamic(t *testing.T) {
func TestGetHistoricTrades(t *testing.T) {
t.Parallel()
result, err := ok.GetHistoricTrades(contextGenerate(), currency.NewPair(currency.BTC, currency.USDT), asset.Spot, time.Now().Add(-time.Minute*4), time.Now().Add(-time.Minute*2))
result, err := ok.GetHistoricTrades(contextGenerate(), currency.NewBTCUSDT(), asset.Spot, time.Now().Add(-time.Minute*4), time.Now().Add(-time.Minute*2))
require.NoError(t, err)
assert.NotNil(t, result)
}
@@ -4138,15 +4138,15 @@ func TestWSProcessTrades(t *testing.T) {
func TestInstrumentsSubscription(t *testing.T) {
t.Parallel()
err := ok.InstrumentsSubscription(contextGenerate(), "subscribe", asset.Spot, currency.NewPair(currency.BTC, currency.USDT))
err := ok.InstrumentsSubscription(contextGenerate(), "subscribe", asset.Spot, currency.NewBTCUSDT())
assert.NoError(t, err)
}
func TestTickersSubscription(t *testing.T) {
t.Parallel()
err := ok.TickersSubscription(contextGenerate(), "subscribe", asset.Margin, currency.NewPair(currency.BTC, currency.USDT))
err := ok.TickersSubscription(contextGenerate(), "subscribe", asset.Margin, currency.NewBTCUSDT())
require.NoError(t, err)
err = ok.TickersSubscription(contextGenerate(), "unsubscribe", asset.Spot, currency.NewPair(currency.BTC, currency.USDT))
err = ok.TickersSubscription(contextGenerate(), "unsubscribe", asset.Spot, currency.NewBTCUSDT())
assert.NoError(t, err)
}
@@ -4169,7 +4169,7 @@ func TestCandlesticksSubscription(t *testing.T) {
func TestTradesSubscription(t *testing.T) {
t.Parallel()
err := ok.TradesSubscription(contextGenerate(), "subscribe", asset.Spot, currency.NewPair(currency.BTC, currency.USDT))
err := ok.TradesSubscription(contextGenerate(), "subscribe", asset.Spot, currency.NewBTCUSDT())
assert.NoError(t, err)
}
@@ -4275,9 +4275,9 @@ func TestPublicStructureBlockTradesSubscription(t *testing.T) {
func TestBlockTickerSubscription(t *testing.T) {
t.Parallel()
err := ok.BlockTickerSubscription(contextGenerate(), "subscribe", asset.Options, currency.NewPair(currency.BTC, currency.USDT))
err := ok.BlockTickerSubscription(contextGenerate(), "subscribe", asset.Options, currency.NewBTCUSDT())
require.NoError(t, err)
err = ok.BlockTickerSubscription(contextGenerate(), "unsubscribe", asset.Options, currency.NewPair(currency.BTC, currency.USDT))
err = ok.BlockTickerSubscription(contextGenerate(), "unsubscribe", asset.Options, currency.NewBTCUSDT())
assert.NoError(t, err)
}
@@ -4294,7 +4294,7 @@ func TestPublicBlockTradesSubscription(t *testing.T) {
func TestWsAccountSubscription(t *testing.T) {
t.Parallel()
sharedtestvalues.SkipTestIfCredentialsUnset(t, ok)
err := ok.WsAccountSubscription(contextGenerate(), "subscribe", asset.Spot, currency.NewPair(currency.BTC, currency.USDT))
err := ok.WsAccountSubscription(contextGenerate(), "subscribe", asset.Spot, currency.NewBTCUSDT())
assert.NoError(t, err)
}
@@ -4796,7 +4796,7 @@ func TestGetHistoricalFundingRates(t *testing.T) {
func TestIsPerpetualFutureCurrency(t *testing.T) {
t.Parallel()
is, err := ok.IsPerpetualFutureCurrency(asset.Binary, currency.NewPair(currency.BTC, currency.USDT))
is, err := ok.IsPerpetualFutureCurrency(asset.Binary, currency.NewBTCUSDT())
require.NoError(t, err)
require.False(t, is)