dict -> map and support indefinitelist, Datum

Author: nielstron

pycardano/plutus.py

@@ -447,29 +447,43 @@ def get_tag(constr_id: int) -> Optional[int]:
     else:
         return None
 
+
 def id_map(cls, skip_constructor=False):
     """Constructs a unique representation of a PlutusData type definition. Intended for automatic constructor generation."""
     if cls == bytes:
         return "bytes"
     if cls == int:
         return "int"
+    if cls == RawCBOR or cls == RawPlutusData or cls == Datum:
+        return "any"
+    if cls == IndefiniteList:
+        return "list"
     if hasattr(cls, "__origin__"):
         origin = getattr(cls, "__origin__")
         if origin == list:
             prefix = "list"
         elif origin == dict:
-            prefix = "dict"
+            prefix = "map"
         elif origin == typing.Union:
             prefix = "union"
         else:
-            raise TypeError(f"Unexpected parameterized type for automatic constructor generation: {cls}")
+            raise TypeError(
+                f"Unexpected parameterized type for automatic constructor generation: {cls}"
+            )
         return prefix + "<" + ",".join(id_map(a) for a in cls.__args__) + ">"
     if issubclass(cls, PlutusData):
-        return "cons[" + cls.__name__ + "](" + (str(cls.CONSTR_ID) if not skip_constructor else "_") + ";" + ",".join(f.name + ":" + id_map(f.type) for f in fields(cls)) + ")"
-    if cls == RawCBOR or cls == RawPlutusData:
-        return "any"
+        return (
+            "cons["
+            + cls.__name__
+            + "]("
+            + (str(cls.CONSTR_ID) if not skip_constructor else "_")
+            + ";"
+            + ",".join(f.name + ":" + id_map(f.type) for f in fields(cls))
+            + ")"
+        )
     raise TypeError(f"Unexpected type for automatic constructor generation: {cls}")
 
+
 @dataclass(repr=False)
 class PlutusData(ArrayCBORSerializable):
     """

test/pycardano/test_plutus.py

@@ -17,7 +17,8 @@
     RawPlutusData,
     Redeemer,
     RedeemerTag,
-    plutus_script_hash, id_map,
+    plutus_script_hash,
+    id_map, Datum,
 )
 from pycardano.serialization import IndefiniteList, RawCBOR
 
@@ -397,6 +398,7 @@ class A(PlutusData):
         res == res2
     ), "Same class has different default constructor id in two consecutive runs"
 
+
 def test_id_map_supports_all():
     @dataclass
     class A(PlutusData):
@@ -409,6 +411,8 @@ class A(PlutusData):
     class C(PlutusData):
         x: RawPlutusData
         y: RawCBOR
+        z: Datum
+        w: IndefiniteList
 
     @dataclass
     class B(PlutusData):
@@ -417,6 +421,8 @@ class B(PlutusData):
         d: Dict[bytes, C]
         e: Union[A, C]
 
-    s = id_map(B, skip_constructor=True)
-    assert s == "cons[B](_;a:int,c:cons[A](0;a:int,b:bytes,c:list<int>),d:dict<bytes,cons[C](3081122523;x:any,y:any)>,e:union<cons[A](0;a:int,b:bytes,c:list<int>),cons[C](3081122523;x:any,y:any)>)"
-    assert B.CONSTR_ID == 2561434002
+    s = id_map(B)
+    assert (
+        s
+        == "cons[B](1013743048;a:int,c:cons[A](0;a:int,b:bytes,c:list<int>),d:map<bytes,cons[C](892310804;x:any,y:any,z:any,w:list)>,e:union<cons[A](0;a:int,b:bytes,c:list<int>),cons[C](892310804;x:any,y:any,z:any,w:list)>)"
+    )