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

@@ -21,7 +21,7 @@ const (
a = asset.Spot
)
var p = currency.NewPair(currency.BTC, currency.USD)
var p = currency.NewBTCUSD()
type fakeEvent struct {
secretID int64
@@ -223,7 +223,7 @@ func TestSetStream(t *testing.T) {
if len(b.stream) != 0 {
t.Errorf("received '%v' expected '%v'", len(b.stream), 0)
}
cp := currency.NewPair(currency.BTC, currency.USD)
cp := currency.NewBTCUSD()
err = b.SetStream([]Event{
&fakeEvent{
Base: &event.Base{
@@ -288,7 +288,7 @@ func TestSetStream(t *testing.T) {
func TestNext(t *testing.T) {
t.Parallel()
b := &Base{}
cp := currency.NewPair(currency.BTC, currency.USD)
cp := currency.NewBTCUSD()
err := b.SetStream([]Event{
&fakeEvent{
Base: &event.Base{
@@ -344,7 +344,7 @@ func TestNext(t *testing.T) {
func TestHistory(t *testing.T) {
t.Parallel()
b := &Base{}
cp := currency.NewPair(currency.BTC, currency.USD)
cp := currency.NewBTCUSD()
err := b.SetStream([]Event{
&fakeEvent{
Base: &event.Base{
@@ -398,7 +398,7 @@ func TestHistory(t *testing.T) {
func TestLatest(t *testing.T) {
t.Parallel()
b := &Base{}
cp := currency.NewPair(currency.BTC, currency.USD)
cp := currency.NewBTCUSD()
err := b.SetStream([]Event{
&fakeEvent{
Base: &event.Base{
@@ -463,7 +463,7 @@ func TestLatest(t *testing.T) {
func TestList(t *testing.T) {
t.Parallel()
b := &Base{}
cp := currency.NewPair(currency.BTC, currency.USD)
cp := currency.NewBTCUSD()
err := b.SetStream([]Event{
&fakeEvent{
Base: &event.Base{
@@ -505,7 +505,7 @@ func TestList(t *testing.T) {
func TestIsLastEvent(t *testing.T) {
t.Parallel()
b := &Base{}
cp := currency.NewPair(currency.BTC, currency.USD)
cp := currency.NewBTCUSD()
err := b.SetStream([]Event{
&fakeEvent{
Base: &event.Base{
@@ -621,7 +621,7 @@ func TestAppendStream(t *testing.T) {
t.Errorf("received '%v' expected '%v'", len(b.stream), 0)
}
tt := time.Now().Add(-time.Hour)
cp := currency.NewPair(currency.BTC, currency.USD)
cp := currency.NewBTCUSD()
e.Exchange = "b"
e.AssetType = asset.Spot
e.CurrencyPair = cp
@@ -762,7 +762,7 @@ func (f fakeEvent) GetTime() time.Time {
}
func (f fakeEvent) Pair() currency.Pair {
return currency.NewPair(currency.BTC, currency.USD)
return currency.NewBTCUSD()
}
func (f fakeEvent) GetExchange() string {

View File

@@ -21,7 +21,7 @@ func TestLoadCandles(t *testing.T) {
exch, err := em.NewExchangeByName(testExchange)
require.NoError(t, err, "NewExchangeByName must not error")
exch.SetDefaults()
cp := currency.NewPair(currency.BTC, currency.USDT)
cp := currency.NewBTCUSDT()
b := exch.GetBase()
b.CurrencyPairs.Pairs = make(map[asset.Item]*currency.PairStore)
b.CurrencyPairs.Pairs[asset.Spot] = &currency.PairStore{
@@ -48,7 +48,7 @@ func TestLoadTrades(t *testing.T) {
exch, err := em.NewExchangeByName(testExchange)
require.NoError(t, err, "NewExchangeByName must not error")
exch.SetDefaults()
cp := currency.NewPair(currency.BTC, currency.USDT)
cp := currency.NewBTCUSDT()
b := exch.GetBase()
b.CurrencyPairs.Pairs = make(map[asset.Item]*currency.PairStore)
b.CurrencyPairs.Pairs[asset.Spot] = &currency.PairStore{

View File

@@ -16,7 +16,7 @@ const testExchange = "binance"
func TestLoadDataCandles(t *testing.T) {
exch := testExchange
a := asset.Spot
p := currency.NewPair(currency.BTC, currency.USDT)
p := currency.NewBTCUSDT()
_, err := LoadData(
common.DataCandle,
filepath.Join("..", "..", "..", "..", "testdata", "binance_BTCUSDT_24h_2019_01_01_2020_01_01.csv"),
@@ -33,7 +33,7 @@ func TestLoadDataCandles(t *testing.T) {
func TestLoadDataTrades(t *testing.T) {
exch := testExchange
a := asset.Spot
p := currency.NewPair(currency.BTC, currency.USDT)
p := currency.NewBTCUSDT()
_, err := LoadData(
common.DataTrade,
filepath.Join("..", "..", "..", "..", "testdata", "binance_BTCUSDT_24h-trades_2020_11_16.csv"),
@@ -50,7 +50,7 @@ func TestLoadDataTrades(t *testing.T) {
func TestLoadDataInvalid(t *testing.T) {
exch := testExchange
a := asset.Spot
p := currency.NewPair(currency.BTC, currency.USDT)
p := currency.NewBTCUSDT()
_, err := LoadData(
-1,
filepath.Join("..", "..", "..", "..", "testdata", "binance_BTCUSDT_24h-trades_2020_11_16.csv"),

View File

@@ -57,7 +57,7 @@ func TestMain(m *testing.M) {
func TestLoadDataCandles(t *testing.T) {
exch := testExchange
a := asset.Spot
p := currency.NewPair(currency.BTC, currency.USDT)
p := currency.NewBTCUSDT()
var err error
bot := &engine.Engine{}
dbConfg := database.Config{
@@ -132,7 +132,7 @@ func TestLoadDataCandles(t *testing.T) {
func TestLoadDataTrades(t *testing.T) {
exch := testExchange
a := asset.Spot
p := currency.NewPair(currency.BTC, currency.USDT)
p := currency.NewBTCUSDT()
var err error
bot := &engine.Engine{}
dbConfg := database.Config{
@@ -200,7 +200,7 @@ func TestLoadDataTrades(t *testing.T) {
func TestLoadDataInvalid(t *testing.T) {
exch := testExchange
a := asset.Spot
p := currency.NewPair(currency.BTC, currency.USDT)
p := currency.NewBTCUSDT()
dStart := time.Date(2020, 1, 0, 0, 0, 0, 0, time.UTC)
dEnd := time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC)
_, err := LoadData(dStart, dEnd, gctkline.FifteenMin.Duration(), exch, -1, p, a, false)

View File

@@ -23,7 +23,7 @@ func TestLoad(t *testing.T) {
t.Parallel()
exch := testExchange
a := asset.Spot
p := currency.NewPair(currency.BTC, currency.USDT)
p := currency.NewBTCUSDT()
tt := time.Now()
d := DataFromKline{
Base: &data.Base{},
@@ -60,7 +60,7 @@ func TestHasDataAtTime(t *testing.T) {
dEnd := time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC)
exch := testExchange
a := asset.Spot
p := currency.NewPair(currency.BTC, currency.USDT)
p := currency.NewBTCUSDT()
d := DataFromKline{
Base: &data.Base{},
}
@@ -148,7 +148,7 @@ func TestHasDataAtTime(t *testing.T) {
func TestAppend(t *testing.T) {
t.Parallel()
a := asset.Spot
p := currency.NewPair(currency.BTC, currency.USDT)
p := currency.NewBTCUSDT()
tt1 := time.Date(2020, 1, 0, 0, 0, 0, 0, time.UTC)
tt2 := time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC)
d := DataFromKline{
@@ -211,7 +211,7 @@ func TestStreamOpen(t *testing.T) {
t.Parallel()
exch := testExchange
a := asset.Spot
p := currency.NewPair(currency.BTC, currency.USDT)
p := currency.NewBTCUSDT()
d := DataFromKline{
Base: &data.Base{},
}
@@ -258,7 +258,7 @@ func TestStreamVolume(t *testing.T) {
t.Parallel()
exch := testExchange
a := asset.Spot
p := currency.NewPair(currency.BTC, currency.USDT)
p := currency.NewBTCUSDT()
d := DataFromKline{
Base: &data.Base{},
}
@@ -305,7 +305,7 @@ func TestStreamClose(t *testing.T) {
t.Parallel()
exch := testExchange
a := asset.Spot
p := currency.NewPair(currency.BTC, currency.USDT)
p := currency.NewBTCUSDT()
d := DataFromKline{
Base: &data.Base{},
}
@@ -353,7 +353,7 @@ func TestStreamHigh(t *testing.T) {
t.Parallel()
exch := testExchange
a := asset.Spot
p := currency.NewPair(currency.BTC, currency.USDT)
p := currency.NewBTCUSDT()
d := DataFromKline{
Base: &data.Base{},
}
@@ -401,7 +401,7 @@ func TestStreamLow(t *testing.T) {
t.Parallel()
exch := testExchange
a := asset.Spot
p := currency.NewPair(currency.BTC, currency.USDT)
p := currency.NewBTCUSDT()
d := DataFromKline{
Base: &data.Base{},
RangeHolder: &gctkline.IntervalRangeHolder{},

View File

@@ -18,7 +18,7 @@ const testExchange = "okx"
func TestLoadCandles(t *testing.T) {
t.Parallel()
interval := gctkline.OneHour
cp := currency.NewPair(currency.BTC, currency.USDT)
cp := currency.NewBTCUSDT()
a := asset.Spot
em := engine.NewExchangeManager()
exch, err := em.NewExchangeByName(testExchange)
@@ -44,7 +44,7 @@ func TestLoadCandles(t *testing.T) {
func TestLoadTrades(t *testing.T) {
t.Parallel()
interval := gctkline.OneMin
cp := currency.NewPair(currency.BTC, currency.USDT)
cp := currency.NewBTCUSDT()
a := asset.Spot
em := engine.NewExchangeManager()
exch, err := em.NewExchangeByName(testExchange)