Fix rpc message order

substrateinterface/base.py

@@ -55,6 +55,22 @@
 logger = logging.getLogger(__name__)
 
 
+def list_remove_iter(xs: list):
+    removed = False
+    def remove():
+        nonlocal removed
+        removed = True
+
+    i = 0
+    while i < len(xs):
+        removed = False
+        yield xs[i], remove
+        if removed:
+            xs.pop(i)
+        else:
+            i += 1
+
+
 class KeypairType:
     ED25519 = 0
     SR25519 = 1
@@ -743,16 +759,13 @@ def rpc_request(self, method, params, result_handler=None):
             subscription_id = None
 
             while json_body is None:
-
-                self.__rpc_message_queue.append(json.loads(self.websocket.recv()))
-
                 # Search for subscriptions
-                for message in self.__rpc_message_queue:
+                for message, remove_message in list_remove_iter(self.__rpc_message_queue):
 
                     # Check if result message is matching request ID
                     if 'id' in message and message['id'] == request_id:
 
-                        self.__rpc_message_queue.remove(message)
+                        remove_message()
 
                         # Check if response has error
                         if 'error' in message:
@@ -769,11 +782,11 @@ def rpc_request(self, method, params, result_handler=None):
                             json_body = message
 
                 # Process subscription updates
-                for message in self.__rpc_message_queue:
+                for message, remove_message in list_remove_iter(self.__rpc_message_queue):
                     # Check if message is meant for this subscription
                     if 'params' in message and message['params']['subscription'] == subscription_id:
 
-                        self.__rpc_message_queue.remove(message)
+                        remove_message()
 
                         self.debug_message(f"Websocket result [{subscription_id} #{update_nr}]: {message}")
 
@@ -784,6 +797,10 @@ def rpc_request(self, method, params, result_handler=None):
 
                         update_nr += 1
 
+                # Read one more message to queue
+                if json_body is None:
+                    self.__rpc_message_queue.append(json.loads(self.websocket.recv()))
+
         else:
 
             if result_handler: