chore: more unsubscribe

polkadot-cloud · Nov 7, 2024 · b952ab0 · b952ab0
1 parent 42901d1
commit b952ab0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/model/Observables/ChainSpec.ts b/src/model/Observables/ChainSpec.ts
@@ -27,7 +27,8 @@ export class ChainSpec implements ObservableGetSubscription {
         const observable = client.chainHead$().follow$;
 
         // Handle subscription failure.
-        const error = async () => {
+        const error = async (err: AnyJson) => {
+          console.log(err);
           this.unsubscribe();
           reject(null);
         };
@@ -54,6 +55,7 @@ export class ChainSpec implements ObservableGetSubscription {
                 !('specVersion' in spec) ||
                 !('transactionVersion' in spec)
               ) {
+                this.unsubscribe();
                 reject(null);
               } else {
                 // Persist chain spec data to class.
@@ -62,6 +64,7 @@ export class ChainSpec implements ObservableGetSubscription {
 
               // Call `complete` to stop observable emissions & resolve function.
               subscription.complete();
+              this.unsubscribe();
             }
           },
           error,
@@ -78,6 +81,7 @@ export class ChainSpec implements ObservableGetSubscription {
   // Unsubscribe from class subscription.
   unsubscribe = (): void => {
     if (typeof this.#unsub === 'function') {
+      console.log('UNSUBSCRIBING FROM CHAINSPEC');
       this.#unsub();
     }
   };

diff --git a/src/model/Observables/TaggedMetadata.ts b/src/model/Observables/TaggedMetadata.ts
@@ -54,6 +54,7 @@ export class TaggedMetadata implements ObservableGetSubscription {
               !('outerEnums' in data) ||
               !('custom' in data)
             ) {
+              this.unsubscribe();
               reject(null);
             } else {
               // Persist data to class. NOTE: Currently not using `LookupEntry`, can explore this