refactor tests for new constructor pattern

README.md

@@ -240,10 +240,9 @@ ws.on('close', () => {
   console.log('connection closed');
 });
 
-// Optional: Listen to raw error events.
+// Optional: Listen to raw error events. Recommended.
-// Note: responses to invalid topics are currently only sent in the "response" event.
 ws.on('error', err => {
-  console.error('ERR', err);
+  console.error('error', err);
 });
 ```
 

examples/rest-spot-public.ts

@@ -1,9 +1,9 @@
-import { SpotClient } from '../src/index';
+import { SpotClientV3 } from '../src/index';
 
 // or
-// import { SpotClient } from 'bybit-api';
+// import { SpotClientV3 } from 'bybit-api';
 
-const client = new SpotClient();
+const client = new SpotClientV3();
 
 const symbol = 'BTCUSDT';
 

src/util/BaseRestClient.ts

@@ -24,7 +24,7 @@ interface SignedRequestContext {
   timestamp?: number;
   api_key?: string;
   recv_window?: number;
-  // spot is diff from the rest...
+  // spot v1 is diff from the rest...
   recvWindow?: number;
 }
 
@@ -45,8 +45,8 @@ interface UnsignedRequest<T> {
 type SignMethod = 'keyInBody' | 'usdc';
 
 export default abstract class BaseRestClient {
-  private timeOffset: number | null;
+  private timeOffset: number | null = null;
-  private syncTimePromise: null | Promise<any>;
+  private syncTimePromise: null | Promise<any> = null;
   private options: RestClientOptions;
   private baseUrl: string;
   private globalRequestOptions: AxiosRequestConfig;
@@ -66,19 +66,12 @@ export default abstract class BaseRestClient {
    * @param {string} secret - your API secret
    * @param {boolean} [useLivenet=false]
    * @param {RestClientOptions} [restClientOptions={}] options to configure REST API connectivity
-   * @param {AxiosRequestConfig} [requestOptions={}] HTTP networking options for axios
+   * @param {AxiosRequestConfig} [networkOptions={}] HTTP networking options for axios
    */
   constructor(
-    key?: string | undefined,
+    restOptions: RestClientOptions = {},
-    secret?: string | undefined,
+    networkOptions: AxiosRequestConfig = {}
-    useLivenet: boolean = false,
-    options: RestClientOptions = {},
-    requestOptions: AxiosRequestConfig = {}
   ) {
-    const baseUrl = getRestBaseUrl(useLivenet, options);
-    this.timeOffset = null;
-    this.syncTimePromise = null;
-
     this.clientType = this.getClientType();
 
     this.options = {
@@ -89,24 +82,26 @@ export default abstract class BaseRestClient {
       enable_time_sync: false,
       /** How often to sync time drift with bybit servers (if time sync is enabled) */
       sync_interval_ms: 3600000,
-      ...options,
+      ...restOptions,
     };
 
     this.globalRequestOptions = {
       // in ms == 5 minutes by default
       timeout: 1000 * 60 * 5,
       // custom request options based on axios specs - see: https://github.com/axios/axios#request-config
-      ...requestOptions,
+      ...networkOptions,
       headers: {
         'x-referer': APIID,
       },
     };
 
-    this.baseUrl = baseUrl;
+    this.baseUrl = getRestBaseUrl(!!this.options.testnet, restOptions);
+    this.key = this.options.key;
+    this.secret = this.options.secret;
 
-    if (key && !secret) {
+    if (this.key && !this.secret) {
       throw new Error(
-        'API Key & Secret are both required for private enpoints'
+        'API Key & Secret are both required for private endpoints'
       );
     }
 
@@ -114,9 +109,6 @@ export default abstract class BaseRestClient {
       this.syncTime();
       setInterval(this.syncTime.bind(this), +this.options.sync_interval_ms!);
     }
-
-    this.key = key;
-    this.secret = secret;
   }
 
   private isSpotClient() {

src/util/requestUtils.ts

@@ -1,4 +1,13 @@
 export interface RestClientOptions {
+  /** Your API key */
+  key?: string;
+
+  /** Your API secret */
+  secret?: string;
+
+  /** Set to `true` to connect to testnet. Uses the live environment by default. */
+  testnet?: boolean;
+
   /** Override the max size of the request window (in ms) */
   recv_window?: number;
 
@@ -43,7 +52,7 @@ export function serializeParams(
 }
 
 export function getRestBaseUrl(
-  useLivenet: boolean,
+  useTestnet: boolean,
   restInverseOptions: RestClientOptions
 ): string {
   const exchangeBaseUrls = {
@@ -55,12 +64,13 @@ export function getRestBaseUrl(
     return restInverseOptions.baseUrl;
   }
 
-  if (useLivenet === true) {
+  if (useTestnet) {
-    return exchangeBaseUrls.livenet;
-  }
     return exchangeBaseUrls.testnet;
   }
 
+  return exchangeBaseUrls.livenet;
+}
+
 export function isWsPong(msg: any): boolean {
   if (!msg) {
     return false;

src/websocket-client.ts

@@ -47,12 +47,19 @@ export type WsClientEvent =
   | 'response';
 
 interface WebsocketClientEvents {
+  /** Connection opened. If this connection was previously opened and reconnected, expect the reconnected event instead */
   open: (evt: { wsKey: WsKey; event: any }) => void;
+  /** Reconnecting a dropped connection */
   reconnect: (evt: { wsKey: WsKey; event: any }) => void;
+  /** Successfully reconnected a connection that dropped */
   reconnected: (evt: { wsKey: WsKey; event: any }) => void;
+  /** Connection closed */
   close: (evt: { wsKey: WsKey; event: any }) => void;
+  /** Received reply to websocket command (e.g. after subscribing to topics) */
   response: (response: any) => void;
+  /** Received data for topic */
   update: (response: any) => void;
+  /** Exception from ws client OR custom listeners */
   error: (response: any) => void;
 }
 
@@ -92,6 +99,10 @@ export class WebsocketClient extends EventEmitter {
       fetchTimeOffsetBeforeAuth: false,
       ...options,
     };
+    this.options.restOptions = {
+      ...this.options.restOptions,
+      testnet: this.options.testnet,
+    };
 
     this.prepareRESTClient();
   }
@@ -105,9 +116,6 @@ export class WebsocketClient extends EventEmitter {
     switch (this.options.market) {
       case 'inverse': {
         this.restClient = new InverseClient(
-          undefined,
-          undefined,
-          !this.isTestnet(),
           this.options.restOptions,
           this.options.requestOptions
         );
@@ -115,9 +123,6 @@ export class WebsocketClient extends EventEmitter {
       }
       case 'linear': {
         this.restClient = new LinearClient(
-          undefined,
-          undefined,
-          !this.isTestnet(),
           this.options.restOptions,
           this.options.requestOptions
         );
@@ -125,9 +130,6 @@ export class WebsocketClient extends EventEmitter {
       }
       case 'spot': {
         this.restClient = new SpotClient(
-          undefined,
-          undefined,
-          !this.isTestnet(),
           this.options.restOptions,
           this.options.requestOptions
         );
@@ -136,9 +138,6 @@ export class WebsocketClient extends EventEmitter {
       }
       case 'spotv3': {
         this.restClient = new SpotClientV3(
-          undefined,
-          undefined,
-          !this.isTestnet(),
           this.options.restOptions,
           this.options.requestOptions
         );
@@ -146,9 +145,6 @@ export class WebsocketClient extends EventEmitter {
       }
       case 'usdcOption': {
         this.restClient = new USDCOptionClient(
-          undefined,
-          undefined,
-          !this.isTestnet(),
           this.options.restOptions,
           this.options.requestOptions
         );
@@ -156,9 +152,6 @@ export class WebsocketClient extends EventEmitter {
       }
       case 'usdcPerp': {
         this.restClient = new USDCPerpetualClient(
-          undefined,
-          undefined,
-          !this.isTestnet(),
           this.options.restOptions,
           this.options.requestOptions
         );
@@ -167,9 +160,6 @@ export class WebsocketClient extends EventEmitter {
       case 'unifiedOption':
       case 'unifiedPerp': {
         this.restClient = new UnifiedMarginClient(
-          undefined,
-          undefined,
-          !this.isTestnet(),
           this.options.restOptions,
           this.options.requestOptions
         );

test/account-asset/private.read.test.ts

@@ -2,7 +2,6 @@ import { AccountAssetClient } from '../../src/';
 import { successResponseObject } from '../response.util';
 
 describe('Private Account Asset REST API GET Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
@@ -11,7 +10,11 @@ describe('Private Account Asset REST API GET Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new AccountAssetClient(API_KEY, API_SECRET, useLivenet);
+  const api = new AccountAssetClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   it('getInternalTransfers()', async () => {
     expect(await api.getInternalTransfers()).toMatchObject(

test/account-asset/public.read.test.ts

@@ -2,11 +2,14 @@ import { AccountAssetClient } from '../../src';
 import { successResponseObject } from '../response.util';
 
 describe('Public Account Asset REST API Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = undefined;
   const API_SECRET = undefined;
 
-  const api = new AccountAssetClient(API_KEY, API_SECRET, useLivenet);
+  const api = new AccountAssetClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   it('getSupportedDepositList()', async () => {
     expect(await api.getSupportedDepositList()).toMatchObject(

test/copy-trading/private.read.test.ts

@@ -1,7 +1,6 @@
 import { API_ERROR_CODE, CopyTradingClient } from '../../src';
 
 describe('Private Copy Trading REST API GET Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
@@ -10,7 +9,11 @@ describe('Private Copy Trading REST API GET Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new CopyTradingClient(API_KEY, API_SECRET, useLivenet);
+  const api = new CopyTradingClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   // Don't have copy trading properly enabled on the test account, so testing is very light
   // (just make sure auth works and endpoint doesn't throw)

test/copy-trading/public.read.test.ts

@@ -2,11 +2,14 @@ import { CopyTradingClient } from '../../src';
 import { successResponseObject } from '../response.util';
 
 describe('Public Copy Trading REST API Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = undefined;
   const API_SECRET = undefined;
 
-  const api = new CopyTradingClient(API_KEY, API_SECRET, useLivenet);
+  const api = new CopyTradingClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   it('getSymbols()', async () => {
     expect(await api.getSymbols()).toMatchObject({

test/inverse-futures/private.read.test.ts

@@ -2,11 +2,14 @@ import { InverseFuturesClient } from '../../src/inverse-futures-client';
 import { successResponseList, successResponseObject } from '../response.util';
 
 describe('Private Inverse-Futures REST API GET Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
-  const api = new InverseFuturesClient(API_KEY, API_SECRET, useLivenet);
+  const api = new InverseFuturesClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   // Warning: if some of these start to fail with 10001 params error, it's probably that this future expired and a newer one exists with a different symbol!
   const symbol = 'BTCUSDU22';

test/inverse-futures/private.write.test.ts

@@ -2,7 +2,6 @@ import { API_ERROR_CODE, InverseFuturesClient } from '../../src';
 import { successResponseObject } from '../response.util';
 
 describe('Private Inverse-Futures REST API POST Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
@@ -11,7 +10,11 @@ describe('Private Inverse-Futures REST API POST Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new InverseFuturesClient(API_KEY, API_SECRET, useLivenet);
+  const api = new InverseFuturesClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   // Warning: if some of these start to fail with 10001 params error, it's probably that this future expired and a newer one exists with a different symbol!
   const symbol = 'BTCUSDU22';

test/inverse-futures/public.test.ts

@@ -6,8 +6,7 @@ import {
 } from '../response.util';
 
 describe('Public Inverse-Futures REST API Endpoints', () => {
-  const useLivenet = true;
+  const api = new InverseFuturesClient();
-  const api = new InverseFuturesClient(undefined, undefined, useLivenet);
 
   const symbol = 'BTCUSD';
   const interval = '15';

test/inverse/private.read.test.ts

@@ -2,7 +2,6 @@ import { InverseClient } from '../../src/';
 import { successResponseList, successResponseObject } from '../response.util';
 
 describe('Private Inverse REST API GET Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
@@ -11,7 +10,11 @@ describe('Private Inverse REST API GET Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new InverseClient(API_KEY, API_SECRET, useLivenet);
+  const api = new InverseClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   const symbol = 'BTCUSD';
 

test/inverse/private.write.test.ts

@@ -3,7 +3,6 @@ import { InverseClient } from '../../src/inverse-client';
 import { successResponseObject } from '../response.util';
 
 describe('Private Inverse REST API POST Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
@@ -12,7 +11,11 @@ describe('Private Inverse REST API POST Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new InverseClient(API_KEY, API_SECRET, useLivenet);
+  const api = new InverseClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   const symbol = 'BTCUSD';
 

test/inverse/public.test.ts

@@ -6,8 +6,7 @@ import {
 } from '../response.util';
 
 describe('Public Inverse REST API Endpoints', () => {
-  const useLivenet = true;
+  const api = new InverseClient();
-  const api = new InverseClient(undefined, undefined, useLivenet);
 
   const symbol = 'BTCUSD';
   const interval = '15';

test/linear/private.read.test.ts

@@ -2,7 +2,6 @@ import { LinearClient } from '../../src/linear-client';
 import { successResponseList, successResponseObject } from '../response.util';
 
 describe('Private Linear REST API GET Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
@@ -11,7 +10,11 @@ describe('Private Linear REST API GET Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new LinearClient(API_KEY, API_SECRET, useLivenet);
+  const api = new LinearClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   const symbol = 'BTCUSDT';
 

test/linear/private.write.test.ts

@@ -2,7 +2,6 @@ import { API_ERROR_CODE, LinearClient } from '../../src';
 import { successResponseObject } from '../response.util';
 
 describe('Private Linear REST API POST Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
@@ -11,7 +10,11 @@ describe('Private Linear REST API POST Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new LinearClient(API_KEY, API_SECRET, useLivenet);
+  const api = new LinearClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   // Warning: if some of these start to fail with 10001 params error, it's probably that this future expired and a newer one exists with a different symbol!
   const symbol = 'BTCUSDT';

test/spot/private.v1.read.test.ts

@@ -2,7 +2,6 @@ import { SpotClient } from '../../src';
 import { errorResponseObject, successResponseList } from '../response.util';
 
 describe('Private Spot REST API GET Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
@@ -11,7 +10,11 @@ describe('Private Spot REST API GET Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new SpotClient(API_KEY, API_SECRET, useLivenet);
+  const api = new SpotClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   it('getOrder()', async () => {
     // No auth error == test pass

test/spot/private.v1.write.test.ts

@@ -2,7 +2,6 @@ import { API_ERROR_CODE, SpotClient } from '../../src';
 import { successResponseObject } from '../response.util';
 
 describe('Private Spot REST API POST Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
@@ -11,7 +10,11 @@ describe('Private Spot REST API POST Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new SpotClient(API_KEY, API_SECRET, useLivenet);
+  const api = new SpotClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   // Warning: if some of these start to fail with 10001 params error, it's probably that this future expired and a newer one exists with a different symbol!
   const symbol = 'BTCUSDT';

test/spot/private.v3.read.test.ts

@@ -6,7 +6,6 @@ import {
 } from '../response.util';
 
 describe('Private Spot REST API GET Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
@@ -15,7 +14,11 @@ describe('Private Spot REST API GET Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new SpotClientV3(API_KEY, API_SECRET, useLivenet);
+  const api = new SpotClientV3({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   const symbol = 'BTCUSDT';
   const interval = '15m';

test/spot/private.v3.write.test.ts

@@ -2,7 +2,6 @@ import { API_ERROR_CODE, SpotClientV3 } from '../../src';
 import { successResponseObjectV3 } from '../response.util';
 
 describe('Private Spot REST API POST Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
@@ -11,7 +10,11 @@ describe('Private Spot REST API POST Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new SpotClientV3(API_KEY, API_SECRET, useLivenet);
+  const api = new SpotClientV3({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   const symbol = 'BTCUSDT';
   const ltCode = 'BTC3S';

test/unified-margin/private.read.test.ts

@@ -2,7 +2,6 @@ import { API_ERROR_CODE, UnifiedMarginClient } from '../../src';
 import { successResponseObjectV3 } from '../response.util';
 
 describe('Private Unified Margin REST API GET Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
@@ -11,7 +10,11 @@ describe('Private Unified Margin REST API GET Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new UnifiedMarginClient(API_KEY, API_SECRET, useLivenet);
+  const api = new UnifiedMarginClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   const symbol = 'BTCUSDT';
   const category = 'linear';

test/unified-margin/private.write.test.ts

@@ -1,7 +1,6 @@
 import { API_ERROR_CODE, UnifiedMarginClient } from '../../src';
 
 describe('Private Unified Margin REST API POST Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
@@ -10,7 +9,11 @@ describe('Private Unified Margin REST API POST Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new UnifiedMarginClient(API_KEY, API_SECRET, useLivenet);
+  const api = new UnifiedMarginClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   const symbol = 'BTCUSDT';
   const category = 'linear';

test/unified-margin/public.read.test.ts

@@ -5,11 +5,14 @@ import {
 } from '../response.util';
 
 describe('Public Unified Margin REST API Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = undefined;
   const API_SECRET = undefined;
 
-  const api = new UnifiedMarginClient(API_KEY, API_SECRET, useLivenet);
+  const api = new UnifiedMarginClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   const symbol = 'BTCUSDT';
   const category = 'linear';

test/usdc/options/private.read.test.ts

@@ -2,7 +2,6 @@ import { USDCOptionClient } from '../../../src';
 import { successResponseObjectV3 } from '../../response.util';
 
 describe('Private USDC Options REST API GET Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
   const symbol = 'BTC-30SEP22-400000-C';
@@ -12,7 +11,11 @@ describe('Private USDC Options REST API GET Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new USDCOptionClient(API_KEY, API_SECRET, useLivenet);
+  const api = new USDCOptionClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
   const category = 'OPTION';
 
   it('getActiveRealtimeOrders()', async () => {

test/usdc/options/private.write.test.ts

@@ -2,7 +2,6 @@ import { API_ERROR_CODE, USDCOptionClient } from '../../../src';
 import { successResponseObjectV3 } from '../../response.util';
 
 describe('Private USDC Options REST API POST Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
@@ -11,7 +10,11 @@ describe('Private USDC Options REST API POST Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new USDCOptionClient(API_KEY, API_SECRET, useLivenet);
+  const api = new USDCOptionClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   const currency = 'USDC';
   const symbol = 'BTC-30SEP22-400000-C';

test/usdc/options/public.read.test.ts

@@ -5,11 +5,14 @@ import {
 } from '../../response.util';
 
 describe('Public USDC Options REST API Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = undefined;
   const API_SECRET = undefined;
 
-  const api = new USDCOptionClient(API_KEY, API_SECRET, useLivenet);
+  const api = new USDCOptionClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
   const symbol = 'BTC-30SEP22-400000-C';
 
   it('getOrderBook()', async () => {

test/usdc/perpetual/private.read.test.ts

@@ -2,7 +2,6 @@ import { USDCPerpetualClient } from '../../../src';
 import { successResponseObjectV3 } from '../../response.util';
 
 describe('Private USDC Perp REST API GET Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
@@ -11,7 +10,11 @@ describe('Private USDC Perp REST API GET Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new USDCPerpetualClient(API_KEY, API_SECRET, useLivenet);
+  const api = new USDCPerpetualClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   const symbol = 'BTCPERP';
   const category = 'PERPETUAL';

test/usdc/perpetual/private.write.test.ts

@@ -5,7 +5,6 @@ import {
 } from '../../response.util';
 
 describe('Private USDC Perp REST API POST Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = process.env.API_KEY_COM;
   const API_SECRET = process.env.API_SECRET_COM;
 
@@ -14,7 +13,11 @@ describe('Private USDC Perp REST API POST Endpoints', () => {
     expect(API_SECRET).toStrictEqual(expect.any(String));
   });
 
-  const api = new USDCPerpetualClient(API_KEY, API_SECRET, useLivenet);
+  const api = new USDCPerpetualClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   const symbol = 'BTCPERP';
 

test/usdc/perpetual/public.read.test.ts

@@ -5,11 +5,14 @@ import {
 } from '../../response.util';
 
 describe('Public USDC Perp REST API Endpoints', () => {
-  const useLivenet = true;
   const API_KEY = undefined;
   const API_SECRET = undefined;
 
-  const api = new USDCPerpetualClient(API_KEY, API_SECRET, useLivenet);
+  const api = new USDCPerpetualClient({
+    key: API_KEY,
+    secret: API_SECRET,
+    testnet: false,
+  });
 
   const symbol = 'BTCPERP';
   const category = 'PERPETUAL';