ADD. adding ogmios parsing integration test

UPDATE. improve NativeScript.from_dict() by pulling out primitive list building step

Author: daehan-koreapool

integration-test/test/test_ogmios.py

@@ -1,10 +1,8 @@
 from retry import retry
-import pytest
 
 from .base import TEST_RETRIES, TestBase
 
 
-@pytest.mark.single
 class TestProtocolParam(TestBase):
     @retry(tries=TEST_RETRIES, backoff=1.5, delay=6, jitter=(0, 4))
     def test_protocol_param_cost_models(self):

pycardano/backend/blockfrost.py

@@ -29,6 +29,7 @@
     UTxO,
     Value,
 )
+from pycardano.types import JSON
 
 __all__ = ["BlockFrostChainContext"]
 
@@ -147,9 +148,10 @@ def _get_script(
                 cbor2.loads(bytes.fromhex(self.api.script_cbor(script_hash).cbor))
             )
         else:
-            return NativeScript.from_dict(
-                self.api.script_json(script_hash, return_type="json")["json"]
-            )
+            script_json: JSON = self.api.script_json(script_hash, return_type="json")[
+                "json"
+            ]
+            return NativeScript.from_dict(script_json)
 
     def utxos(self, address: str) -> List[UTxO]:
         results = self.api.address_utxos(address, gather_pages=True)

pycardano/nativescript.py

@@ -11,6 +11,7 @@
 from pycardano.exception import DeserializeException
 from pycardano.hash import SCRIPT_HASH_SIZE, ScriptHash, VerificationKeyHash
 from pycardano.serialization import ArrayCBORSerializable, Primitive, list_hook
+from pycardano.types import JSON
 
 __all__ = [
     "NativeScript",
@@ -25,6 +26,9 @@
 
 @dataclass
 class NativeScript(ArrayCBORSerializable):
+    json_tag: ClassVar[str]
+    json_field: ClassVar[str]
+
     @classmethod
     def from_primitive(
         cls: Type[NativeScript], value: Primitive
@@ -54,7 +58,7 @@ def hash(self) -> ScriptHash:
 
     @classmethod
     def from_dict(
-        cls: NativeScript, script: dict, top_level: bool = True
+        cls: Type[NativeScript], script_json: JSON
     ) -> Union[
         ScriptPubkey, ScriptAll, ScriptAny, ScriptNofK, InvalidBefore, InvalidHereAfter
     ]:
@@ -71,27 +75,48 @@ def from_dict(
                 InvalidHereAfter,
             ]
         }
+        script_type = script_json["type"]
+        target_class = types[script_type]
+        script_primitive = cls._script_dict_to_primitive(script_json)
+        return super(NativeScript, target_class).from_primitive(script_primitive[1:])
 
-        native_script = []
-        if isinstance(script, dict):
+    @classmethod
+    def _script_dict_to_primitive(
+        cls: Type[NativeScript], script_json: JSON
+    ) -> List[Primitive]:
+        """Serialize a standard JSON native script into a primitive array"""
 
-            for key, value in script.items():
-                if key == "type":
-                    native_script.insert(0, list(types.keys()).index(value))
-                elif key == "scripts":
-                    native_script.append(cls.from_dict(value, top_level=False))
-                else:
-                    native_script.append(value)
+        types = {
+            p.json_tag: p
+            for p in [
+                ScriptPubkey,
+                ScriptAll,
+                ScriptAny,
+                ScriptNofK,
+                InvalidBefore,
+                InvalidHereAfter,
+            ]
+        }
 
-        elif isinstance(script, list):  # list
-            native_script = [cls.from_dict(i, top_level=False) for i in script]
+        script_type: str = script_json["type"]
+        native_script = [types[script_type]._TYPE]
 
-        if not top_level:
-            return native_script
-        else:
-            return super(NativeScript, types[script["type"]]).from_primitive(
-                native_script[1:]
-            )
+        for key, value in script_json.items():
+            if key == "type":
+                continue
+            elif key == "scripts":
+                native_script.append(cls._script_list_to_primitive(value))
+            else:
+                native_script.append(value)
+        return native_script
+
+    @classmethod
+    def _script_list_to_primitive(
+        cls: Type[NativeScript], script_jsons: List[JSON]
+    ) -> List[List[Primitive]]:
+        """Parse a list of JSON scripts into a list of primitive arrays"""
+        native_script = [cls._script_dict_to_primitive(i) for i in script_jsons]
+        return native_script
 
     def to_dict(self) -> dict:
         """Export to standard native script dictionary (potentially to dump to a JSON file)."""