diff --git a/test/response.util.ts b/test/response.util.ts index 760e352..2804b66 100644 --- a/test/response.util.ts +++ b/test/response.util.ts @@ -10,7 +10,7 @@ export function successResponseList(successMsg: string | null = 'OK') { }; } -export function successResponseListV3(successMsg: string | null = 'OK') { +export function successResponseListV3() { return { result: { list: expect.any(Array), diff --git a/test/usdc/options/private.read.test.ts b/test/usdc/options/private.read.test.ts index 1535304..04f446e 100644 --- a/test/usdc/options/private.read.test.ts +++ b/test/usdc/options/private.read.test.ts @@ -1,8 +1,5 @@ import { USDCOptionClient } from '../../../src'; -import { - successResponseObject, - successUSDCResponseObject, -} from '../../response.util'; +import { successResponseObjectV3 } from '../../response.util'; describe('Private Account Asset REST API Endpoints', () => { const useLivenet = true; @@ -20,63 +17,61 @@ describe('Private Account Asset REST API Endpoints', () => { it('getActiveRealtimeOrders()', async () => { expect(await api.getActiveRealtimeOrders()).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getActiveOrders()', async () => { expect(await api.getActiveOrders({ category })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getHistoricOrders()', async () => { expect(await api.getHistoricOrders({ category })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getOrderExecutionHistory()', async () => { expect(await api.getOrderExecutionHistory({ category })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getTransactionLog()', async () => { expect(await api.getTransactionLog({ type: 'TRADE' })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getBalances()', async () => { - expect(await api.getBalances()).toMatchObject(successUSDCResponseObject()); + expect(await api.getBalances()).toMatchObject(successResponseObjectV3()); }); it('getAssetInfo()', async () => { - expect(await api.getAssetInfo()).toMatchObject(successUSDCResponseObject()); + expect(await api.getAssetInfo()).toMatchObject(successResponseObjectV3()); }); it('getMarginMode()', async () => { - expect(await api.getMarginMode()).toMatchObject( - successUSDCResponseObject() - ); + expect(await api.getMarginMode()).toMatchObject(successResponseObjectV3()); }); it('getPositions()', async () => { expect(await api.getPositions({ category })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getDeliveryHistory()', async () => { expect(await api.getDeliveryHistory({ symbol })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getPositionsInfoUponExpiry()', async () => { expect(await api.getPositionsInfoUponExpiry()).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); }); diff --git a/test/usdc/options/private.write.test.ts b/test/usdc/options/private.write.test.ts index 2949d0e..7a6f9c8 100644 --- a/test/usdc/options/private.write.test.ts +++ b/test/usdc/options/private.write.test.ts @@ -1,5 +1,5 @@ import { API_ERROR_CODE, USDCOptionClient } from '../../../src'; -import { successUSDCResponseObject } from '../../response.util'; +import { successResponseObjectV3 } from '../../response.util'; describe('Private Account Asset REST API Endpoints', () => { const useLivenet = true; @@ -132,7 +132,7 @@ describe('Private Account Asset REST API Endpoints', () => { it('setMarginMode()', async () => { expect(await api.setMarginMode('REGULAR_MARGIN')).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); diff --git a/test/usdc/options/public.read.test.ts b/test/usdc/options/public.read.test.ts index 97ff6bd..891082c 100644 --- a/test/usdc/options/public.read.test.ts +++ b/test/usdc/options/public.read.test.ts @@ -1,7 +1,7 @@ import { USDCOptionClient } from '../../../src'; import { successResponseObject, - successUSDCResponseObject, + successResponseObjectV3, } from '../../response.util'; describe('Public USDC Options REST API Endpoints', () => { @@ -14,37 +14,37 @@ describe('Public USDC Options REST API Endpoints', () => { it('getOrderBook()', async () => { expect(await api.getOrderBook(symbol)).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getContractInfo()', async () => { expect(await api.getContractInfo()).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getSymbolTicker()', async () => { expect(await api.getSymbolTicker(symbol)).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getDeliveryPrice()', async () => { expect(await api.getDeliveryPrice()).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getLast500Trades()', async () => { expect(await api.getLast500Trades({ category: 'OPTION' })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getHistoricalVolatility()', async () => { expect(await api.getHistoricalVolatility()).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); diff --git a/test/usdc/perpetual/private.read.test.ts b/test/usdc/perpetual/private.read.test.ts index 23e5121..ae86d70 100644 --- a/test/usdc/perpetual/private.read.test.ts +++ b/test/usdc/perpetual/private.read.test.ts @@ -1,5 +1,5 @@ import { USDCPerpetualClient } from '../../../src'; -import { successUSDCResponseObject } from '../../response.util'; +import { successResponseObjectV3 } from '../../response.util'; describe('Private Account Asset REST API Endpoints', () => { const useLivenet = true; @@ -18,57 +18,55 @@ describe('Private Account Asset REST API Endpoints', () => { it('getActiveOrders()', async () => { expect(await api.getActiveOrders({ category })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getHistoricOrders()', async () => { expect(await api.getHistoricOrders({ category })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getOrderExecutionHistory()', async () => { expect(await api.getOrderExecutionHistory({ category })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getTransactionLog()', async () => { expect(await api.getTransactionLog({ type: 'TRADE' })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getBalances()', async () => { - expect(await api.getBalances()).toMatchObject(successUSDCResponseObject()); + expect(await api.getBalances()).toMatchObject(successResponseObjectV3()); }); it('getAssetInfo()', async () => { - expect(await api.getAssetInfo()).toMatchObject(successUSDCResponseObject()); + expect(await api.getAssetInfo()).toMatchObject(successResponseObjectV3()); }); it('getMarginMode()', async () => { - expect(await api.getMarginMode()).toMatchObject( - successUSDCResponseObject() - ); + expect(await api.getMarginMode()).toMatchObject(successResponseObjectV3()); }); it('getPositions()', async () => { expect(await api.getPositions({ category })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getSettlementHistory()', async () => { expect(await api.getSettlementHistory({ symbol })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getPredictedFundingRate()', async () => { expect(await api.getPredictedFundingRate(symbol)).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); }); diff --git a/test/usdc/perpetual/private.write.test.ts b/test/usdc/perpetual/private.write.test.ts index ced7af4..97637a0 100644 --- a/test/usdc/perpetual/private.write.test.ts +++ b/test/usdc/perpetual/private.write.test.ts @@ -1,7 +1,7 @@ import { API_ERROR_CODE, USDCPerpetualClient } from '../../../src'; import { - successUSDCEmptyResponseObject, - successUSDCResponseObject, + successEmptyResponseObjectV3, + successResponseObjectV3, } from '../../response.util'; describe('Private Account Asset REST API Endpoints', () => { @@ -62,13 +62,13 @@ describe('Private Account Asset REST API Endpoints', () => { it('cancelActiveOrders()', async () => { expect(await api.cancelActiveOrders(symbol, 'Order')).toMatchObject( - successUSDCEmptyResponseObject() + successEmptyResponseObjectV3() ); }); it('setMarginMode()', async () => { expect(await api.setMarginMode('REGULAR_MARGIN')).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); diff --git a/test/usdc/perpetual/public.read.test.ts b/test/usdc/perpetual/public.read.test.ts index 60ce93e..68a902a 100644 --- a/test/usdc/perpetual/public.read.test.ts +++ b/test/usdc/perpetual/public.read.test.ts @@ -1,7 +1,7 @@ import { USDCKlineRequest, USDCPerpetualClient } from '../../../src'; import { successResponseObject, - successUSDCResponseObject, + successResponseObjectV3, } from '../../response.util'; describe('Public USDC Options REST API Endpoints', () => { @@ -19,73 +19,73 @@ describe('Public USDC Options REST API Endpoints', () => { it('getOrderBook()', async () => { expect(await api.getOrderBook(symbol)).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getContractInfo()', async () => { expect(await api.getContractInfo()).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getSymbolTicker()', async () => { expect(await api.getSymbolTicker(symbol)).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getCandles()', async () => { expect(await api.getCandles(candleRequest)).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getMarkPrice()', async () => { expect(await api.getMarkPrice(candleRequest)).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getIndexPrice()', async () => { expect(await api.getIndexPrice(candleRequest)).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getIndexPremium()', async () => { expect(await api.getIndexPremium(candleRequest)).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getOpenInterest()', async () => { expect(await api.getOpenInterest({ symbol, period: '1m' })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getLargeOrders()', async () => { expect(await api.getLargeOrders({ symbol })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getLongShortRatio()', async () => { expect(await api.getLongShortRatio({ symbol, period: '1m' })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getLast500Trades()', async () => { expect(await api.getLast500Trades({ category })).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); }); it('getLastFundingRate()', async () => { expect(await api.getLastFundingRate(symbol)).toMatchObject( - successUSDCResponseObject() + successResponseObjectV3() ); });