Add test to check that id_map supports complex types

Author: nielstron

pycardano/plutus.py

@@ -463,9 +463,9 @@ def id_map(cls, skip_constructor=False):
             prefix = "union"
         else:
             raise TypeError(f"Unexpected parameterized type for automatic constructor generation: {cls}")
-        return prefix + "(" + ",".join(id_map(a) for a in cls.__args__) + ")"
+        return prefix + "<" + ",".join(id_map(a) for a in cls.__args__) + ">"
     if issubclass(cls, PlutusData):
-        return "constructor:" + cls.__name__ + "(" + (str(cls.CONSTR_ID) if not skip_constructor else "_") + ";" + ",".join(f.name + ":" + id_map(f.type) for f in fields(cls)) + ")"
+        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"
     raise TypeError(f"Unexpected type for automatic constructor generation: {cls}")

test/pycardano/test_plutus.py

@@ -17,9 +17,9 @@
     RawPlutusData,
     Redeemer,
     RedeemerTag,
-    plutus_script_hash,
+    plutus_script_hash, id_map,
 )
-from pycardano.serialization import IndefiniteList
+from pycardano.serialization import IndefiniteList, RawCBOR
 
 
 @dataclass
@@ -396,3 +396,27 @@ class A(PlutusData):
     assert (
         res == res2
     ), "Same class has different default constructor id in two consecutive runs"
+
+def test_id_map_supports_all():
+    @dataclass
+    class A(PlutusData):
+        CONSTR_ID = 0
+        a: int
+        b: bytes
+        c: List[int]
+
+    @dataclass
+    class C(PlutusData):
+        x: RawPlutusData
+        y: RawCBOR
+
+    @dataclass
+    class B(PlutusData):
+        a: int
+        c: A
+        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