refactor: addressing review feedback

Author: boblat

src/_algopy_testing/primitives/array.py

@@ -45,7 +45,6 @@ def __getitem__(cls, item: tuple[type[_TArrayItem], type[_TArrayLength]]) -> typ
 
 class ImmutableFixedArray(
     Serializable,
-    MutableBytes,
     typing.Generic[_TArrayItem, _TArrayLength],
     metaclass=_ImmutableFixedArrayMeta,
 ):
@@ -58,8 +57,8 @@ def __new__(cls, values: Iterable[_TArrayItem]) -> typing.Self:
         try:
             assert cls._element_type
         except AttributeError:
+            items = list(values)
             try:
-                items = list(values)
                 item = items[0]
             except IndexError:
                 raise TypeError("array must have an item type") from None
@@ -106,12 +105,11 @@ def __reversed__(self) -> typing.Iterator[_TArrayItem]:
     def length(self) -> UInt64:
         return UInt64(len(self._items))
 
-    def __len__(self) -> UInt64:
-        return self.length
+    def __len__(self) -> int:
+        return len(self._items)
 
     def __getitem__(self, index: UInt64 | int) -> _TArrayItem:
-        value = self._items[index]
-        return set_item_on_mutate(self, index, value)
+        return self._items[index]
 
     def __setitem__(self, index: UInt64 | int, value: _TArrayItem) -> _TArrayItem:
         self._items[int(index)] = value
@@ -180,11 +178,9 @@ class FixedArray(
     _length: int
 
     def __new__(cls, values: Iterable[_TArrayItem]) -> typing.Self:
-        try:
-            assert cls._element_type
-        except AttributeError:
+        if not hasattr(cls, "_element_type"):
+            items = list(values)
             try:
-                items = list(values)
                 item = items[0]
             except IndexError:
                 raise TypeError("array must have an item type") from None
@@ -206,7 +202,7 @@ def __init__(self, values: Iterable[_TArrayItem]) -> None:
 
     @classmethod
     def full(cls, item: _TArrayItem) -> typing.Self:
-        return cls(item for _ in range(cls._length))
+        return cls([item] * cls._length)
 
     def __iter__(self) -> typing.Iterator[_TArrayItem]:
         return iter(self._items)
@@ -218,8 +214,8 @@ def __reversed__(self) -> typing.Iterator[_TArrayItem]:
     def length(self) -> UInt64:
         return UInt64(len(self._items))
 
-    def __len__(self) -> UInt64:
-        return self.length
+    def __len__(self) -> int:
+        return len(self._items)
 
     def __getitem__(self, index: UInt64 | int) -> _TArrayItem:
         value = self._items[index]
@@ -278,9 +274,7 @@ def __getitem__(cls, element_t: type) -> type:
         return c
 
 
-class ImmutableArray(
-    Serializable, MutableBytes, typing.Generic[_TArrayItem], metaclass=_ImmutableArrayMeta
-):
+class ImmutableArray(Serializable, typing.Generic[_TArrayItem], metaclass=_ImmutableArrayMeta):
     _element_type: typing.ClassVar[type]
 
     # ensure type is fully parameterized by looking up type from metaclass
@@ -316,12 +310,11 @@ def __reversed__(self) -> Iterator[_TArrayItem]:
     def length(self) -> UInt64:
         return UInt64(len(self._items))
 
-    def __len__(self) -> UInt64:
-        return self.length
+    def __len__(self) -> int:
+        return len(self._items)
 
     def __getitem__(self, index: UInt64 | int) -> _TArrayItem:
-        value = self._items[index]
-        return set_item_on_mutate(self, index, value)
+        return self._items[index]
 
     def __setitem__(self, index: UInt64 | int, value: _TArrayItem) -> _TArrayItem:
         self._items[int(index)] = value
@@ -437,8 +430,8 @@ def __new__(cls, values: Iterable[_TArrayItem]) -> typing.Self:
         try:
             assert cls._element_type
         except AttributeError:
+            items = list(values)
             try:
-                items = list(values)
                 item = items[0]
             except IndexError:
                 raise TypeError("array must have an item type") from None
@@ -464,8 +457,8 @@ def __reversed__(self) -> typing.Iterator[_TArrayItem]:
     def length(self) -> UInt64:
         return UInt64(len(self._items))
 
-    def __len__(self) -> UInt64:
-        return self.length
+    def __len__(self) -> int:
+        return len(self._items)
 
     def __getitem__(self, index: UInt64 | int) -> _TArrayItem:
         value = self._items[index]

tests/models/test_box.py

@@ -415,23 +415,22 @@ def test_arrays_and_struct_in_boxes(context: AlgopyTestContext) -> None:  # noqa
     assert list(box2.value[0]) == [UInt64(1), UInt64(20), UInt64(3)]
 
     # ImmutableArray
-    nested_arr3 = ImmutableArray[Array[UInt64]](arr1, arr2)
-    box3 = Box(ImmutableArray[Array[UInt64]], key=b"test_array_3")
+    nested_arr3 = ImmutableArray[ImmutableArray[UInt64]](
+        ImmutableArray(*arr1), ImmutableArray(*arr2)
+    )
+    box3 = Box(ImmutableArray[ImmutableArray[UInt64]], key=b"test_array_3")
     box3.value = nested_arr3
     _op_box_content, op_box_exists = algopy.op.Box.get(b"test_array_3")
     op_box_length, _ = algopy.op.Box.length(b"test_array_3")
     assert op_box_exists
     assert box3.length == op_box_length
 
-    box3.value[0][1] = UInt64(20)
-    assert list(box3.value[0]) == [UInt64(1), UInt64(20), UInt64(3)]
-
     # ImmutableFixedArray
-    nested_arr4 = ImmutableFixedArray[FixedArray[UInt64, typing.Literal[3]], typing.Literal[2]](
-        [arr3, arr4]
-    )
+    nested_arr4 = ImmutableFixedArray[
+        ImmutableFixedArray[UInt64, typing.Literal[3]], typing.Literal[2]
+    ]([ImmutableFixedArray(arr3), ImmutableFixedArray(arr4)])
     box4 = Box(
-        ImmutableFixedArray[FixedArray[UInt64, typing.Literal[3]], typing.Literal[2]],
+        ImmutableFixedArray[ImmutableFixedArray[UInt64, typing.Literal[3]], typing.Literal[2]],
         key=b"test_array_4",
     )
     box4.value = nested_arr4
@@ -440,9 +439,6 @@ def test_arrays_and_struct_in_boxes(context: AlgopyTestContext) -> None:  # noqa
     assert op_box_exists
     assert box4.length == op_box_length
 
-    box4.value[0][1] = UInt64(20)
-    assert list(box4.value[0]) == [UInt64(1), UInt64(20), UInt64(3)]
-
     # Struct
     struct1 = Swapped2(arr1, arr2)
     box5 = Box(