handle value of invalid length in bitwise operations

Author: boblat

src/_algopy_testing/primitives/fixed_bytes.py

@@ -56,8 +56,7 @@ class FixedBytes(
 ):
     """A statically-sized byte sequence, where the length is known at compile time.
 
-    Unlike `Bytes`, `FixedBytes` has a fixed length specified via a type parameter,
-    allowing for compile-time validation and more efficient operations on the AVM.
+    Unlike `Bytes`, `FixedBytes` has a fixed length specified via a type parameter.
 
     Example:
         FixedBytes[typing.Literal[32]]  # A 32-byte fixed-size bytes value
@@ -99,6 +98,9 @@ def __eq__(self, other: FixedBytes[_TBytesLength_Arg] | Bytes | bytes) -> bool:
             other_bytes = as_bytes(other)
         except TypeError:
             return NotImplemented
+
+        if isinstance(other, FixedBytes) and other.length != self.length:
+            return False
         return self.value == other_bytes
 
     def __hash__(self) -> int:
@@ -126,15 +128,16 @@ def __getitem__(
     ) -> Bytes:  # maps to substring/substring3 if slice, extract/extract3 otherwise?
         """Returns a Bytes containing a single byte if indexed with UInt64 or int
         otherwise the substring o bytes described by the slice."""
+        value = self.value[None : self.length]
         if isinstance(index, slice):
-            return Bytes(self.value[index])
+            return Bytes(value[index])
         else:
             int_index = index.value if isinstance(index, UInt64) else index
-            int_index = len(self.value) + int_index if int_index < 0 else int_index
-            if (int_index >= len(self.value)) or (int_index < 0):
+            int_index = self.length.value + int_index if int_index < 0 else int_index
+            if (int_index >= self.length) or (int_index < 0):
                 raise ValueError("FixedBytes index out of range")
             # my_bytes[0:1] => b'j' whereas my_bytes[0] => 106
-            return Bytes(self.value[slice(int_index, int_index + 1)])
+            return Bytes(value[slice(int_index, int_index + 1)])
 
     def __iter__(self) -> Iterator[Bytes]:
         """FixedBytes can be iterated, yielding each consecutive byte."""
@@ -157,13 +160,7 @@ def __and__(self, other: FixedBytes[_TBytesLength_Arg] | bytes | Bytes) -> typin
         """
         return self._operate_bitwise(other, "and_")
 
-    @typing.overload
-    def __rand__(self, other: typing.Self) -> typing.Self: ...  # type: ignore[overload-overlap]
-    @typing.overload
-    def __rand__(self, other: FixedBytes[_TBytesLength_Arg] | bytes | Bytes) -> Bytes: ...
-    def __rand__(
-        self, other: FixedBytes[_TBytesLength_Arg] | bytes | Bytes
-    ) -> typing.Self | Bytes:
+    def __rand__(self, other: bytes) -> Bytes:
         return self & other
 
     def __iand__(self, other: Bytes | typing.Self | bytes) -> typing.Self:  # type: ignore[misc]
@@ -180,11 +177,7 @@ def __or__(self, other: FixedBytes[_TBytesLength_Arg] | bytes | Bytes) -> Bytes:
     def __or__(self, other: FixedBytes[_TBytesLength_Arg] | bytes | Bytes) -> typing.Self | Bytes:
         return self._operate_bitwise(other, "or_")
 
-    @typing.overload
-    def __ror__(self, other: typing.Self) -> typing.Self: ...  # type: ignore[overload-overlap]
-    @typing.overload
-    def __ror__(self, other: FixedBytes[_TBytesLength_Arg] | bytes | Bytes) -> Bytes: ...
-    def __ror__(self, other: FixedBytes[_TBytesLength_Arg] | bytes | Bytes) -> typing.Self | Bytes:
+    def __ror__(self, other: bytes) -> Bytes:
         return self | other
 
     def __ior__(self, other: Bytes | typing.Self | bytes) -> typing.Self:  # type: ignore[misc]
@@ -201,13 +194,7 @@ def __xor__(self, other: FixedBytes[_TBytesLength_Arg] | bytes | Bytes) -> Bytes
     def __xor__(self, other: FixedBytes[_TBytesLength_Arg] | bytes | Bytes) -> typing.Self | Bytes:
         return self._operate_bitwise(other, "xor")
 
-    @typing.overload
-    def __rxor__(self, other: typing.Self) -> typing.Self: ...  # type: ignore[overload-overlap]
-    @typing.overload
-    def __rxor__(self, other: FixedBytes[_TBytesLength_Arg] | bytes | Bytes) -> Bytes: ...
-    def __rxor__(
-        self, other: FixedBytes[_TBytesLength_Arg] | bytes | Bytes
-    ) -> typing.Self | Bytes:
+    def __rxor__(self, other: bytes) -> Bytes:
         return self ^ other
 
     def __ixor__(self, other: Bytes | typing.Self | bytes) -> typing.Self:  # type: ignore[misc]
@@ -223,7 +210,7 @@ def __invert__(self) -> typing.Self:
         Returns:
             Bytes: The result of the bitwise inversion operation.
         """
-        return self.__class__(bytes(~x + 256 for x in self.value))
+        return self.__class__.from_bytes(bytes(~x + 256 for x in self.value))
 
     def _operate_bitwise(
         self,
@@ -244,7 +231,7 @@ def _operate_bitwise(
             )
         )
         if isinstance(other, FixedBytes) and len(other.value) == len(self.value):
-            return self.__class__(result)
+            return self.__class__.from_bytes(result)
         return Bytes(result)
 
     def __contains__(self, item: FixedBytes[_TBytesLength_Arg] | Bytes | bytes) -> bool: