From dfec98ff63ef25ad219d609da8fdc9cc9c5fa4ef Mon Sep 17 00:00:00 2001
From: "ilinikh.a1" <ilinikh.a@n-t.io>
Date: Mon, 30 Oct 2023 22:44:15 +0600
Subject: [PATCH] feat: improve generic features

---
 .../bingx-get-perpetual-swap-account-asset-endpoint.ts      | 5 +++--
 .../endpoints/bingx-perpetual-swap-positions-endpoint.ts    | 5 +++--
 src/bingx/endpoints/bingx-request.interface.ts              | 1 -
 src/bingx/endpoints/bingx-trade-order-endpoint.ts           | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/bingx/endpoints/bingx-get-perpetual-swap-account-asset-endpoint.ts b/src/bingx/endpoints/bingx-get-perpetual-swap-account-asset-endpoint.ts
index fd21d86..e3e17d4 100644
--- a/src/bingx/endpoints/bingx-get-perpetual-swap-account-asset-endpoint.ts
+++ b/src/bingx/endpoints/bingx-get-perpetual-swap-account-asset-endpoint.ts
@@ -4,6 +4,7 @@ import { SignatureInterface } from 'bingx-api/bingx/account/signature.interface'
 import { AccountInterface } from 'bingx-api/bingx/account/account.interface';
 import { DefaultSignatureParameters } from 'bingx-api/bingx/account/default-signature-parameters';
 import { SignatureParametersInterface } from 'bingx-api/bingx/account/signature-parameters.interface';
+import { BingxResponse } from 'bingx-api/bingx';
 
 export interface BalanceData {
   balance: {
@@ -20,7 +21,7 @@ export interface BalanceData {
 }
 
 export class BingxGetPerpetualSwapAccountAssetEndpoint<R = BalanceData>
-  implements EndpointInterface<R>
+  implements EndpointInterface<BingxResponse<R>>
 {
   constructor(private readonly account: AccountInterface) {}
 
@@ -44,5 +45,5 @@ export class BingxGetPerpetualSwapAccountAssetEndpoint<R = BalanceData>
     return this.account.sign(this.parameters());
   }
 
-  readonly t!: R;
+  readonly t!: BingxResponse<R>;
 }
diff --git a/src/bingx/endpoints/bingx-perpetual-swap-positions-endpoint.ts b/src/bingx/endpoints/bingx-perpetual-swap-positions-endpoint.ts
index 2201298..3a85c44 100644
--- a/src/bingx/endpoints/bingx-perpetual-swap-positions-endpoint.ts
+++ b/src/bingx/endpoints/bingx-perpetual-swap-positions-endpoint.ts
@@ -4,6 +4,7 @@ import { SignatureParametersInterface } from 'bingx-api/bingx/account/signature-
 import { AccountInterface } from 'bingx-api/bingx/account/account.interface';
 import { DefaultSignatureParameters } from 'bingx-api/bingx/account/default-signature-parameters';
 import { OrderPositionSideEnum } from 'bingx-api/bingx/enums/order-position-side.enum';
+import { BingxResponse } from 'bingx-api/bingx';
 
 export interface PerpetualSwapPositionsData<
   T extends number | string = string,
@@ -23,7 +24,7 @@ export interface PerpetualSwapPositionsData<
 
 export class BingxPerpetualSwapPositionsEndpoint<R = PerpetualSwapPositionsData>
   extends Endpoint
-  implements EndpointInterface<R>
+  implements EndpointInterface<BingxResponse<R>>
 {
   constructor(
     private readonly symbol: string,
@@ -46,5 +47,5 @@ export class BingxPerpetualSwapPositionsEndpoint<R = PerpetualSwapPositionsData>
     return '/openApi/swap/v2/user/positions';
   }
 
-  readonly t!: R;
+  readonly t!: BingxResponse<R>;
 }
diff --git a/src/bingx/endpoints/bingx-request.interface.ts b/src/bingx/endpoints/bingx-request.interface.ts
index 1052f49..51beca3 100644
--- a/src/bingx/endpoints/bingx-request.interface.ts
+++ b/src/bingx/endpoints/bingx-request.interface.ts
@@ -1,4 +1,3 @@
-import { BingxResponseInterface } from 'bingx-api/bingx/endpoints/bingx-response.interface';
 import { EndpointInterface } from 'bingx-api/bingx/endpoints/endpoint.interface';
 
 export interface BingxRequestInterface<R> {
diff --git a/src/bingx/endpoints/bingx-trade-order-endpoint.ts b/src/bingx/endpoints/bingx-trade-order-endpoint.ts
index ee3c378..c18d2b2 100644
--- a/src/bingx/endpoints/bingx-trade-order-endpoint.ts
+++ b/src/bingx/endpoints/bingx-trade-order-endpoint.ts
@@ -1,6 +1,6 @@
 import { EndpointInterface } from 'bingx-api/bingx/endpoints/endpoint.interface';
 import { Endpoint } from 'bingx-api/bingx/endpoints/endpoint';
-import { SignatureParametersInterface } from '../account/signature-parameters.interface';
+import { BingxResponse, SignatureParametersInterface } from 'bingx-api/bingx';
 import { AccountInterface } from 'bingx-api/bingx/account/account.interface';
 import { BingxCreateTradeOrderInterface } from 'bingx-api/bingx/interfaces/trade-order.interface';
 import { DefaultSignatureParameters } from 'bingx-api/bingx/account/default-signature-parameters';
@@ -21,7 +21,7 @@ export interface BingxOrderResponseInterface {
 
 export class BingxTradeOrderEndpoint<R = BingxOrderResponseInterface>
   extends Endpoint
-  implements EndpointInterface<R>
+  implements EndpointInterface<BingxResponse<R>>
 {
   constructor(
     private readonly order: BingxCreateTradeOrderInterface,
@@ -30,7 +30,7 @@ export class BingxTradeOrderEndpoint<R = BingxOrderResponseInterface>
     super(account);
   }
 
-  readonly t!: R;
+  readonly t!: BingxResponse<R>;
 
   method(): 'get' | 'post' | 'put' | 'patch' | 'delete' {
     return 'post';