chore(): type cleaning, fixes & refactoring

tiagosiebler · Jun 12, 2024 · ad1fb3c · ad1fb3c
1 parent 4124513
commit ad1fb3c
Show file tree

Hide file tree

Showing 22 changed files with 369 additions and 377 deletions.
diff --git a/src/RestClient.ts b/src/RestClient.ts
diff --git a/src/types/request/delivery.ts b/src/types/request/delivery.ts
@@ -3,8 +3,6 @@
  * ==========================================================================================================================
  */
 
-import { FuturesPriceTriggeredOrder } from '../shared';
-
 export interface GetDeliveryOrderBookReq {
   settle: 'usdt';
   contract: string;
@@ -22,7 +20,7 @@ export interface GetDeliveryTradesReq {
   to?: number;
 }
 
-export interface GetDeliveryCandlesticksReq {
+export interface GetDeliveryCandlesReq {
   settle: 'usdt';
   contract: string;
   from?: number;
@@ -117,12 +115,6 @@ export interface GetDeliverySettlementHistoryReq {
   limit?: number;
   at?: number;
 }
-
-export interface submitDeliveryTriggeredOrderReq
-  extends FuturesPriceTriggeredOrder {
-  settle: 'usdt';
-}
-
 export interface GetDeliveryAutoOrdersReq {
   settle: 'usdt';
   status: 'open' | 'finished';

diff --git a/src/types/request/futures.ts b/src/types/request/futures.ts
@@ -3,8 +3,6 @@
  * ==========================================================================================================================
  */
 
-import { FuturesPriceTriggeredOrder } from '../response/futures';
-
 export interface GetFuturesOrderBookReq {
   settle: 'btc' | 'usdt' | 'usd';
   contract: string;
@@ -168,8 +166,31 @@ export interface GetFuturesLiquidationHistoryReq {
   at?: number;
 }
 
-export interface SubmitFuturesPriceTriggeredOrderReq
-  extends FuturesPriceTriggeredOrder {
+export interface SubmitFuturesTriggeredOrderReq {
+  initial: {
+    contract: string;
+    size?: number;
+    price?: string;
+    close?: boolean;
+    tif?: 'gtc' | 'ioc';
+    text?: string;
+    reduce_only?: boolean;
+    auto_size?: string;
+  };
+  trigger: {
+    strategy_type?: 0 | 1;
+    price_type?: 0 | 1 | 2;
+    price?: string;
+    rule?: 1 | 2;
+    expiration?: number;
+  };
+  order_type?:
+    | 'close-long-order'
+    | 'close-short-order'
+    | 'close-long-position'
+    | 'close-short-position'
+    | 'plan-close-long-position'
+    | 'plan-close-short-position';
   settle: 'btc' | 'usdt' | 'usd';
 }
 

diff --git a/src/types/request/options.ts b/src/types/request/options.ts
@@ -25,15 +25,15 @@ export interface GetOptionsOrderBookReq {
   with_id?: boolean;
 }
 
-export interface GetOptionsCandlesticksReq {
+export interface GetOptionsCandlesReq {
   contract: string;
   limit?: number;
   from?: number;
   to?: number;
   interval?: '1m' | '5m' | '15m' | '30m' | '1h';
 }
 
-export interface GetOptionsUnderlyingCandlesticksReq {
+export interface GetOptionsUnderlyingCandlesReq {
   underlying: string;
   limit?: number;
   from?: number;

diff --git a/src/types/request/shared.types.ts b/src/types/request/shared.types.ts
diff --git a/src/types/request/subaccount.ts b/src/types/request/subaccount.ts
@@ -25,6 +25,6 @@ export interface CreateSubAccountApiKeyReq {
   ip_whitelist?: string[]; // IP white list
 }
 
-export interface UpdateSubAccountApiKeyReq extends CreateSubAccountApiKeyReq {
+export type UpdateSubAccountApiKeyReq = {
   key: string;
-}
+} & CreateSubAccountApiKeyReq;
diff --git a/src/types/response/account.ts b/src/types/response/account.ts
@@ -3,7 +3,7 @@
  * ==========================================================================================================================
  */
 
-export interface GetAccountDetailResp {
+export interface AccountDetail {
   user_id: number;
   ip_whitelist: string[];
   currency_pairs: string[];
@@ -13,14 +13,14 @@ export interface GetAccountDetailResp {
   tier: number;
 }
 
-export interface CreateStpGroupResp {
+export interface StpGroup {
   id: number;
   name: string;
   creator_id: number;
   create_time: number;
 }
 
-export interface StpResp {
+export interface StpGroupUser {
   user_id: number;
   stp_id: number;
   create_time: number;

diff --git a/src/types/response/collateralloan.ts b/src/types/response/collateralloan.ts
@@ -3,7 +3,7 @@
  * ==========================================================================================================================
  */
 
-export interface GetLoanOrdersResp {
+export interface LoanOrder {
   order_id: number;
   collateral_currency: string;
   collateral_amount: string;
@@ -22,7 +22,7 @@ export interface GetLoanOrdersResp {
   left_repay_interest: string;
 }
 
-export interface GetLoanRepaymentHistoryResp {
+export interface LoanRepaymentHistoryRecord {
   order_id: number;
   record_id: number;
   repaid_amount: string;
@@ -38,7 +38,7 @@ export interface GetLoanRepaymentHistoryResp {
   after_left_collateral: string;
 }
 
-export interface GetLoanCollateralRecordsResp {
+export interface LoanCollateralRecord {
   order_id: number;
   record_id: number;
   borrow_currency: string;
@@ -51,7 +51,7 @@ export interface GetLoanCollateralRecordsResp {
   operate_time: number;
 }
 
-export interface GetLoanCollateralizationRatioResp {
+export interface LoanCollateralRatio {
   collateral_currency: string;
   borrow_currency: string;
   init_ltv: string;

diff --git a/src/types/response/delivery.ts b/src/types/response/delivery.ts
@@ -3,15 +3,15 @@
  * ==========================================================================================================================
  */
 
-export interface GetDeliveryOrderBookResp {
+export interface DeliveryOrderBook {
   id?: number;
   current: number;
   update: number;
   asks: { p: string; s: number }[];
   bids: { p: string; s: number }[];
 }
 
-export interface GetDeliveryTradesResp {
+export interface DeliveryTrade {
   id: number;
   create_time: number;
   create_time_ms: number;
@@ -21,7 +21,7 @@ export interface GetDeliveryTradesResp {
   is_internal?: boolean;
 }
 
-export interface GetDeliveryCandlesticksResp {
+export interface DeliveryCandle {
   t: number;
   v?: number;
   c: string;
@@ -30,7 +30,7 @@ export interface GetDeliveryCandlesticksResp {
   o: string;
 }
 
-export interface GetDeliveryTickersResp {
+export interface DeliveryTicker {
   contract: string;
   last: string;
   change_percentage: string;
@@ -54,7 +54,7 @@ export interface GetDeliveryTickersResp {
   highest_bid: string;
 }
 
-export interface GetDeliveryAccountResp {
+export interface DeliveryAccount {
   total: string;
   unrealised_pnl: string;
   position_margin: string;
@@ -82,7 +82,7 @@ export interface GetDeliveryAccountResp {
   };
 }
 
-export interface GetDeliveryBookResp {
+export interface DeliveryBook {
   time: number;
   change: string;
   balance: string;
@@ -101,7 +101,7 @@ export interface GetDeliveryBookResp {
   trade_id?: string;
 }
 
-export interface GetDeliveryTradingHistoryResp {
+export interface DeliveryTradingHistoryRecord {
   id: number;
   create_time: number;
   contract: string;
@@ -114,7 +114,7 @@ export interface GetDeliveryTradingHistoryResp {
   point_fee: string;
 }
 
-export interface GetDeliveryClosedPositionsResp {
+export interface DeliveryClosedPosition {
   time: number;
   contract: string;
   side: 'long' | 'short';
@@ -129,7 +129,7 @@ export interface GetDeliveryClosedPositionsResp {
   short_price: string;
 }
 
-export interface GetDeliveryLiquidationHistoryResp {
+export interface DeliveryLiquidationHistoryRecord {
   time: number;
   contract: string;
   leverage?: string;
@@ -144,7 +144,7 @@ export interface GetDeliveryLiquidationHistoryResp {
   left: number;
 }
 
-export interface GetDeliverySettlementHistoryResp {
+export interface DeliverySettlementHistoryRecord {
   time: number;
   contract: string;
   leverage: string;

diff --git a/src/types/response/earn.ts b/src/types/response/earn.ts
@@ -3,7 +3,7 @@
  * ==========================================================================================================================
  */
 
-export interface GetDualInvestmentProductsResp {
+export interface DualInvestmentProduct {
   id: number;
   instrument_name: string;
   invest_currency: string;
@@ -19,7 +19,7 @@ export interface GetDualInvestmentProductsResp {
   status: 'NOTSTARTED' | 'ONGOING' | 'ENDED';
 }
 
-export interface GetDualInvestmentOrdersResp {
+export interface DualInvestmentOrder {
   id: number;
   plan_id: number;
   copies: string;
@@ -43,7 +43,7 @@ export interface GetDualInvestmentOrdersResp {
   delivery_time: number;
 }
 
-export interface GetStructuredProductListResp {
+export interface StructuredProduct {
   id: number;
   type: string;
   name_en: string;
@@ -58,7 +58,7 @@ export interface GetStructuredProductListResp {
   status: 'in_process' | 'will_begin' | 'wait_settlement' | 'done';
 }
 
-export interface GetStructuredProductOrdersResp {
+export interface StructuredProductOrder {
   id: number;
   pid: string;
   lock_coin: string;

diff --git a/src/types/response/earnuni.ts b/src/types/response/earnuni.ts
@@ -3,15 +3,15 @@
  * ==========================================================================================================================
  */
 
-export interface GetLendingCurrenciesResp {
+export interface LendingCurrency {
   currency: string;
   min_lend_amount: string;
   max_lend_amount: string;
   max_rate: string;
   min_rate: string;
 }
 
-export interface GetLendingOrdersResp {
+export interface LendingOrder {
   currency: string;
   current_amount: string;
   amount: string;
@@ -24,7 +24,7 @@ export interface GetLendingOrdersResp {
   update_time: number;
 }
 
-export interface GetLendingRecordsResp {
+export interface LendingRecord {
   currency: string;
   amount: string;
   last_wallet_amount: string;
@@ -34,7 +34,7 @@ export interface GetLendingRecordsResp {
   create_time: number;
 }
 
-export interface GetLendingInterestRecordsResp {
+export interface LendingInterestRecord {
   status: number;
   currency: string;
   actual_rate: string;

diff --git a/src/types/response/flashswap.ts b/src/types/response/flashswap.ts
@@ -3,7 +3,7 @@
  * ==========================================================================================================================
  */
 
-export interface GetFlashSwapCurrencyPairsResp {
+export interface FlashSwapCurrencyPair {
   currency_pair: string;
   sell_currency: string;
   buy_currency: string;
@@ -13,7 +13,7 @@ export interface GetFlashSwapCurrencyPairsResp {
   buy_max_amount: string;
 }
 
-export interface FlashSwapOrderResp {
+export interface FlashSwapOrder {
   id: number;
   create_time: number;
   user_id: number;