Prevent race condition

Author: thewhaleking

async_substrate_interface/async_substrate.py

@@ -842,9 +842,15 @@ async def _exit_with_timer(self):
         """
         try:
             if self.shutdown_timer is not None:
+                logger.debug("Exiting with timer")
                 await asyncio.sleep(self.shutdown_timer)
-            logger.debug("Exiting with timer")
-            await self.shutdown()
+            if (
+                self.state != State.CONNECTING
+                and self._sending.qsize() == 0
+                and not self._received_subscriptions
+                and self._waiting_for_response <= 0
+            ):
+                await self.shutdown()
         except asyncio.CancelledError:
             pass
 
@@ -985,6 +991,7 @@ async def unsubscribe(
             original_id = get_next_id()
             while original_id in self._in_use_ids:
                 original_id = get_next_id()
+            logger.debug(f"Unwatched extrinsic subscription {subscription_id}")
             self._received_subscriptions.pop(subscription_id, None)
 
         to_send = {

tests/helpers/proxy_server.py

@@ -9,7 +9,13 @@
 
 
 class ProxyServer:
-    def __init__(self, upstream: str, time_til_pause: float, time_til_resume: float, port: int = 8080):
+    def __init__(
+        self,
+        upstream: str,
+        time_til_pause: float,
+        time_til_resume: float,
+        port: int = 8080,
+    ):
         self.upstream_server = upstream
         self.time_til_pause = time_til_pause
         self.time_til_resume = time_til_resume

tests/integration_tests/test_async_substrate_interface.py

@@ -200,7 +200,7 @@ async def test_query_map_with_odd_number_of_params():
 async def test_improved_reconnection():
     def get_free_port():
         with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-            s.bind(('', 0))  # Bind to port 0 = OS picks free port
+            s.bind(("", 0))  # Bind to port 0 = OS picks free port
             s.listen(1)
             port_ = s.getsockname()[1]
         return port_