fix: proxy/smoldot providers release connection

paritytech · Nov 22, 2022 · cc936fc · cc936fc
1 parent fd8e2fc
commit cc936fc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/rpc/provider/proxy.ts b/rpc/provider/proxy.ts
@@ -34,10 +34,8 @@ export const proxyProvider: Provider<string, Event, Event, Event> = (url, listen
       })()
     },
     release: () => {
-      let conn
-      try {
-        conn = connection(url, listener)
-      } catch (_error) {
+      const conn = connections.get(url)
+      if (!conn) {
         return Promise.resolve(undefined)
       }
       const { cleanUp, listeners, inner } = conn

diff --git a/rpc/provider/smoldot.ts b/rpc/provider/smoldot.ts
@@ -65,12 +65,10 @@ export const smoldotProvider: Provider<
         }
       })()
     },
-    release: async () => {
-      let conn
-      try {
-        conn = await connection(props, listener)
-      } catch (_error) {
-        return
+    release: () => {
+      const conn = connections.get(props)
+      if (!conn) {
+        return Promise.resolve(undefined)
       }
       const { cleanUp, listeners, inner } = conn
       listeners.delete(listener)
@@ -81,10 +79,10 @@ export const smoldotProvider: Provider<
           // TODO: utilize `deferClosing` prop once we flesh out approach
           inner.remove()
         } catch (e) {
-          return new ProviderCloseError(e as SmoldotCloseErrorData)
+          return Promise.resolve(new ProviderCloseError(e as SmoldotCloseErrorData))
         }
       }
-      return
+      return Promise.resolve(undefined)
     },
   }
 }