Adding tests

Author: thewhaleking

async_substrate_interface/async_substrate.py

@@ -648,6 +648,7 @@ def __init__(
         auto_discover: bool = True,
         ss58_format: Optional[int] = None,
         type_registry: Optional[dict] = None,
+        type_registry_preset: Optional[str] = None,
         chain_name: str = "",
         max_retries: int = 5,
         retry_timeout: float = 60.0,
@@ -664,6 +665,7 @@ def __init__(
             auto_discover: whether to automatically pull the presets based on the chain name and type registry
             ss58_format: the specific SS58 format to use
             type_registry: a dict of custom types
+            type_registry_preset: preset
             chain_name: the name of the chain (the result of the rpc request for "system_chain")
             max_retries: number of times to retry RPC requests before giving up
             retry_timeout: how to long wait since the last ping to retry the RPC request
@@ -693,6 +695,7 @@ def __init__(
         self._forgettable_task = None
         self.ss58_format = ss58_format
         self.type_registry = type_registry
+        self.type_registry_preset = type_registry_preset
         self.runtime_cache = RuntimeCache()
         self.runtime_config = RuntimeConfigurationObject(
             ss58_format=self.ss58_format, implements_scale_info=True

async_substrate_interface/sync_substrate.py

@@ -456,6 +456,7 @@ def __init__(
         auto_discover: bool = True,
         ss58_format: Optional[int] = None,
         type_registry: Optional[dict] = None,
+        type_registry_preset: Optional[str] = None,
         chain_name: str = "",
         max_retries: int = 5,
         retry_timeout: float = 60.0,
@@ -471,6 +472,7 @@ def __init__(
             auto_discover: whether to automatically pull the presets based on the chain name and type registry
             ss58_format: the specific SS58 format to use
             type_registry: a dict of custom types
+            type_registry_preset: preset
             chain_name: the name of the chain (the result of the rpc request for "system_chain")
             max_retries: number of times to retry RPC requests before giving up
             retry_timeout: how to long wait since the last ping to retry the RPC request
@@ -492,13 +494,15 @@ def __init__(
         self._forgettable_task = None
         self.ss58_format = ss58_format
         self.type_registry = type_registry
+        self.type_registry_preset = type_registry_preset
         self.runtime_cache = RuntimeCache()
         self.runtime_config = RuntimeConfigurationObject(
             ss58_format=self.ss58_format, implements_scale_info=True
         )
         self._metadata_cache = {}
         self.metadata_version_hex = "0x0f000000"  # v15
         self.reload_type_registry()
+        self.initialize()
 
     def __enter__(self):
         self.initialize()
@@ -552,16 +556,6 @@ def name(self):
             self._name = self.rpc_request("system_name", []).get("result")
         return self._name
 
-    @property
-    def ws(self) -> ClientConnection:
-        return connect(
-            self.chain_endpoint,
-            options={
-                "max_size": 2**32,
-                "write_limit": 2**16,
-            },
-        )
-
     def get_storage_item(self, module: str, storage_function: str):
         if not self._metadata:
             self.init_runtime()
@@ -1634,11 +1628,11 @@ def _make_rpc_request(
         _received = {}
         subscription_added = False
 
-        with self.ws as ws:
+        with connect(self.chain_endpoint, max_size=2**32) as ws:
             item_id = 0
             for payload in payloads:
                 item_id += 1
-                ws.send(ujson.dumps(payload["payload"]))
+                ws.send(ujson.dumps({**payload["payload"], **{"id": item_id}}))
                 request_manager.add_request(item_id, payload["id"])
 
             while True:

tests/helpers/fixtures.py

@@ -0,0 +1,34 @@
+# Python Substrate Interface Library
+#
+# Copyright 2018-2020 Stichting Polkascan (Polkascan Foundation).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from os import environ
+
+KUSAMA_NODE_URL = (
+    environ.get("SUBSTRATE_NODE_URL_KUSAMA") or "wss://kusama-rpc.polkadot.io/"
+)
+POLKADOT_NODE_URL = (
+    environ.get("SUBSTRATE_NODE_URL_POLKADOT") or "wss://rpc.polkadot.io/"
+)
+ROCOCO_NODE_URL = (
+    environ.get("SUBSTRATE_NODE_URL_ROCOCO") or "wss://rococo-rpc.polkadot.io"
+)
+MOONBEAM_NODE_URL = (
+    environ.get("SUBSTRATE_NODE_URL_ROCOCO") or "wss://wss.api.moonbeam.network"
+)
+
+BABE_NODE_URL = environ.get("SUBSTRATE_BABE_NODE_URL") or POLKADOT_NODE_URL
+AURA_NODE_URL = (
+    environ.get("SUBSTRATE_AURA_NODE_URL") or "wss://acala-rpc-1.aca-api.network"
+)

tests/helpers/settings.py

@@ -1,9 +1,7 @@
 import pytest
 from websockets.exceptions import InvalidURI
 
-from async_substrate_interface.async_substrate import (
-    AsyncSubstrateInterface
-)
+from async_substrate_interface.async_substrate import AsyncSubstrateInterface
 
 
 @pytest.mark.asyncio