Update the signature of the subscribeToAccountTokenTransfers method.

Reject token transfer status watchers when the bridge is disposed
baking-bad · Feb 28, 2024 · cc7bf6c · cc7bf6c
1 parent 85e675c
commit cc7bf6c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/src/bridgeDataProviders/defaultDataProvider/defaultDataProvider.ts b/src/bridgeDataProviders/defaultDataProvider/defaultDataProvider.ts
@@ -93,16 +93,15 @@ export class DefaultDataProvider implements TransfersBridgeDataProvider, Balance
 
   subscribeToAccountTokenTransfers(accountAddress: string): void;
   subscribeToAccountTokenTransfers(accountAddresses: readonly string[]): void;
-  subscribeToAccountTokenTransfers(accountAddressOrAddresses?: string | readonly string[]): void;
-  subscribeToAccountTokenTransfers(accountAddressOrAddresses?: string | readonly string[]): void {
+  subscribeToAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[]): void;
+  subscribeToAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[]): void {
     return this.dipDupBridgeDataProvider.subscribeToAccountTokenTransfers(accountAddressOrAddresses);
   }
 
-  unsubscribeFromAccountTokenTransfers(): void;
   unsubscribeFromAccountTokenTransfers(accountAddress: string): void;
   unsubscribeFromAccountTokenTransfers(accountAddresses: readonly string[]): void;
-  unsubscribeFromAccountTokenTransfers(accountAddressOrAddresses?: string | readonly string[]): void;
-  unsubscribeFromAccountTokenTransfers(accountAddressOrAddresses?: string | readonly string[]): void {
+  unsubscribeFromAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[]): void;
+  unsubscribeFromAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[]): void {
     return this.dipDupBridgeDataProvider.unsubscribeFromAccountTokenTransfers(accountAddressOrAddresses);
   }
 

diff --git a/src/bridgeDataProviders/dipDupBridgeDataProvider/dipDupBridgeDataProvider.ts b/src/bridgeDataProviders/dipDupBridgeDataProvider/dipDupBridgeDataProvider.ts
@@ -146,17 +146,16 @@ export class DipDupBridgeDataProvider extends RemoteService implements Transfers
 
   subscribeToAccountTokenTransfers(accountAddress: string): void;
   subscribeToAccountTokenTransfers(accountAddresses: readonly string[]): void;
-  subscribeToAccountTokenTransfers(accountAddressOrAddresses?: string | readonly string[]): void;
-  subscribeToAccountTokenTransfers(accountAddressOrAddresses?: string | readonly string[]): void {
+  subscribeToAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[]): void;
+  subscribeToAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[]): void {
     this.startDipDupWebSocketClientIfNeeded();
     this.subscribeToTokenTransfersInternal(accountAddressOrAddresses);
   }
 
-  unsubscribeFromAccountTokenTransfers(): void;
   unsubscribeFromAccountTokenTransfers(accountAddress: string): void;
   unsubscribeFromAccountTokenTransfers(accountAddresses: readonly string[]): void;
-  unsubscribeFromAccountTokenTransfers(accountAddressOrAddresses?: string | readonly string[]): void;
-  unsubscribeFromAccountTokenTransfers(accountAddressOrAddresses?: string | readonly string[]): void {
+  unsubscribeFromAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[]): void;
+  unsubscribeFromAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[]): void {
     this.unsubscribeFromTokenTransfersInternal(accountAddressOrAddresses);
   }
 

diff --git a/src/bridgeDataProviders/transfersBridgeDataProvider/transfersBridgeDataProvider.ts b/src/bridgeDataProviders/transfersBridgeDataProvider/transfersBridgeDataProvider.ts
@@ -40,11 +40,11 @@ export interface TransfersBridgeDataProvider {
 
   subscribeToAccountTokenTransfers(accountAddress: string): void;
   subscribeToAccountTokenTransfers(accountAddresses: readonly string[]): void;
-  subscribeToAccountTokenTransfers(accountAddressOrAddresses?: string | readonly string[]): void;
+  subscribeToAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[]): void;
 
   unsubscribeFromAccountTokenTransfers(accountAddress: string): void;
   unsubscribeFromAccountTokenTransfers(accountAddresses: readonly string[]): void;
-  unsubscribeFromAccountTokenTransfers(accountAddressOrAddresses?: string | readonly string[]): void;
+  unsubscribeFromAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[]): void;
 
   unsubscribeFromAllSubscriptions(): void;
 }
diff --git a/src/tokenBridge/tokenBridge.ts b/src/tokenBridge/tokenBridge.ts
@@ -363,7 +363,7 @@ export class TokenBridge implements Disposable {
     if (guards.isDisposable(this.bridgeComponents.transfersBridgeDataProvider))
       this.bridgeComponents.transfersBridgeDataProvider[Symbol.dispose]();
 
-    this.rejectAndClearAllStatusWatchers('The TokenBridge has been stopped!');
+    this.rejectAndClearAllStatusWatchers('The TokenBridge has been disposed!');
     this.detachEvents();
     clearInterval(this.lastCreatedTokenTransfersTimerId);
     this.lastCreatedTokenTransfers.clear();
@@ -471,6 +471,7 @@ export class TokenBridge implements Disposable {
 
   protected unsubscribeFromAllSubscriptions(): void {
     this.bridgeComponents.transfersBridgeDataProvider.unsubscribeFromAllSubscriptions();
+    this.rejectAndClearAllStatusWatchers('Unsubscribe from all subscriptions');
   }
 
   // #endregion