minor refactor

algorandfoundation · Feb 7, 2025 · 0b3e759 · 0b3e759
1 parent 502d663
commit 0b3e759
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/puyapy/awst_build/eb/array.py b/src/puyapy/awst_build/eb/array.py
@@ -72,6 +72,7 @@ def __init__(self, typ: pytypes.PyType, location: SourceLocation):
         assert typ.generic == pytypes.GenericArrayType
         wtype = typ.wtype
         assert isinstance(wtype, wtypes.WArray)
+        assert not wtype.immutable
         self._wtype = wtype
         super().__init__(typ, location)
 
@@ -85,10 +86,8 @@ def call(
     ) -> InstanceBuilder:
         typ = self.produces()
         values = tuple(expect.argument_of_type_else_dummy(a, typ.items).resolve() for a in args)
-        wtype = typ.wtype
-        assert isinstance(wtype, wtypes.WArray)
         return ArrayExpressionBuilder(
-            NewArray(values=values, wtype=wtype, source_location=location), self._pytype
+            NewArray(values=values, wtype=self._wtype, source_location=location), typ
         )
 
 
@@ -263,7 +262,7 @@ def call(
             ArrayConcat(
                 left=NewArray(wtype=imm_wtype, values=[], source_location=location),
                 right=self.expr,
-                wtype=imm_type.wtype,
+                wtype=imm_wtype,
                 source_location=location,
             ),
         )

diff --git a/src/puyapy/awst_build/eb/immutable_array.py b/src/puyapy/awst_build/eb/immutable_array.py
@@ -70,6 +70,7 @@ def __init__(self, typ: pytypes.PyType, location: SourceLocation):
         assert typ.generic == pytypes.GenericImmutableArrayType
         wtype = typ.wtype
         assert isinstance(wtype, wtypes.WArray)
+        assert wtype.immutable
         self._wtype = wtype
         super().__init__(typ, location)
 
@@ -83,10 +84,8 @@ def call(
     ) -> InstanceBuilder:
         typ = self.produces()
         values = tuple(expect.argument_of_type_else_dummy(a, typ.items).resolve() for a in args)
-        wtype = typ.wtype
-        assert isinstance(wtype, wtypes.WArray)
         return ImmutableArrayExpressionBuilder(
-            NewArray(values=values, wtype=wtype, source_location=location), self._pytype
+            NewArray(values=values, wtype=self._wtype, source_location=location), self._pytype
         )