Prettify

drift-labs · Jan 3, 2025 · f82403c · f82403c
1 parent 5f876cf
commit f82403c
Show file tree

Hide file tree

Showing 8 changed files with 114 additions and 123 deletions.
diff --git a/sdk/src/accounts/grpcProgramAccountSubscriber.ts b/sdk/src/accounts/grpcProgramAccountSubscriber.ts
@@ -14,7 +14,7 @@ import {
 } from '../isomorphic/grpc';
 
 export class grpcProgramAccountSubscriber<
-	T,
+	T
 > extends WebSocketProgramAccountSubscriber<T> {
 	client: Client;
 	stream: ClientDuplexStream<SubscribeRequest, SubscribeUpdate>;

diff --git a/sdk/src/accounts/webSocketAccountSubscriber.ts b/sdk/src/accounts/webSocketAccountSubscriber.ts
@@ -98,26 +98,23 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		if (!this.onChange) {
 			throw new Error('onChange callback function must be set');
 		}
-		this.timeoutId = setTimeout(
-			async () => {
-				if (this.isUnsubscribing) {
-					// If we are in the process of unsubscribing, do not attempt to resubscribe
-					return;
-				}
+		this.timeoutId = setTimeout(async () => {
+			if (this.isUnsubscribing) {
+				// If we are in the process of unsubscribing, do not attempt to resubscribe
+				return;
+			}
 
-				if (this.receivingData) {
-					if (this.resubOpts?.logResubMessages) {
-						console.log(
-							`No ws data from ${this.accountName} in ${this.resubOpts.resubTimeoutMs}ms, resubscribing`
-						);
-					}
-					await this.unsubscribe(true);
-					this.receivingData = false;
-					await this.subscribe(this.onChange);
+			if (this.receivingData) {
+				if (this.resubOpts?.logResubMessages) {
+					console.log(
+						`No ws data from ${this.accountName} in ${this.resubOpts.resubTimeoutMs}ms, resubscribing`
+					);
 				}
-			},
-			this.resubOpts?.resubTimeoutMs
-		);
+				await this.unsubscribe(true);
+				this.receivingData = false;
+				await this.subscribe(this.onChange);
+			}
+		}, this.resubOpts?.resubTimeoutMs);
 	}
 
 	async fetch(): Promise<void> {

diff --git a/sdk/src/accounts/webSocketProgramAccountSubscriber.ts b/sdk/src/accounts/webSocketProgramAccountSubscriber.ts
@@ -97,26 +97,23 @@ export class WebSocketProgramAccountSubscriber<T>
 		if (!this.onChange) {
 			throw new Error('onChange callback function must be set');
 		}
-		this.timeoutId = setTimeout(
-			async () => {
-				if (this.isUnsubscribing) {
-					// If we are in the process of unsubscribing, do not attempt to resubscribe
-					return;
-				}
+		this.timeoutId = setTimeout(async () => {
+			if (this.isUnsubscribing) {
+				// If we are in the process of unsubscribing, do not attempt to resubscribe
+				return;
+			}
 
-				if (this.receivingData) {
-					if (this.resubOpts?.logResubMessages) {
-						console.log(
-							`No ws data from ${this.subscriptionName} in ${this.resubOpts?.resubTimeoutMs}ms, resubscribing`
-						);
-					}
-					await this.unsubscribe(true);
-					this.receivingData = false;
-					await this.subscribe(this.onChange);
+			if (this.receivingData) {
+				if (this.resubOpts?.logResubMessages) {
+					console.log(
+						`No ws data from ${this.subscriptionName} in ${this.resubOpts?.resubTimeoutMs}ms, resubscribing`
+					);
 				}
-			},
-			this.resubOpts?.resubTimeoutMs
-		);
+				await this.unsubscribe(true);
+				this.receivingData = false;
+				await this.subscribe(this.onChange);
+			}
+		}, this.resubOpts?.resubTimeoutMs);
 	}
 
 	handleRpcResponse(

diff --git a/sdk/src/driftClient.ts b/sdk/src/driftClient.ts
@@ -3936,8 +3936,9 @@ export class DriftClient {
 		subAccountId?: number
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			(await this.preparePlaceOrdersTx(params, txParams, subAccountId))
-				.placeOrdersTx,
+			(
+				await this.preparePlaceOrdersTx(params, txParams, subAccountId)
+			).placeOrdersTx,
 			[],
 			this.opts,
 			false
@@ -4155,8 +4156,9 @@ export class DriftClient {
 		subAccountId?: number
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
-			(await this.preparePlaceSpotOrderTx(orderParams, txParams, subAccountId))
-				.placeSpotOrderTx,
+			(
+				await this.preparePlaceSpotOrderTx(orderParams, txParams, subAccountId)
+			).placeSpotOrderTx,
 			[],
 			this.opts,
 			false