enhance(testing): add common BytesConcatenation to execution_testing (#1858)

Author: chfast

packages/testing/src/execution_testing/__init__.py

@@ -5,6 +5,7 @@
     Account,
     Address,
     Bytes,
+    BytesConcatenation,
     CoerceBytes,
     Hash,
     Storage,
@@ -143,6 +144,7 @@
     "BlockException",
     "Bytecode",
     "Bytes",
+    "BytesConcatenation",
     "CalldataCase",
     "Case",
     "ChainConfig",

packages/testing/src/execution_testing/base_types/__init__.py

@@ -6,6 +6,7 @@
     BLSPublicKey,
     BLSSignature,
     Bytes,
+    BytesConcatenation,
     CoerceBytes,
     FixedSizeBytes,
     ForkHash,
@@ -56,6 +57,7 @@
     "BLSPublicKey",
     "BLSSignature",
     "Bytes",
+    "BytesConcatenation",
     "CamelModel",
     "CoerceBytes",
     "EmptyOmmersRoot",

packages/testing/src/execution_testing/base_types/base_types.py

@@ -1,8 +1,17 @@
 """Basic type primitives used to define other types."""
 
+from abc import ABCMeta
 from hashlib import sha256
 from re import sub
-from typing import Annotated, Any, ClassVar, SupportsBytes, Type, TypeVar
+from typing import (
+    Annotated,
+    Any,
+    ClassVar,
+    Sized,
+    SupportsBytes,
+    Type,
+    TypeVar,
+)
 
 from Crypto.Hash import keccak
 from pydantic import GetCoreSchemaHandler, StringConstraints
@@ -233,6 +242,22 @@ def __new__(cls, input_bytes: BytesConvertible = b"") -> Self:
         return super(Bytes, cls).__new__(cls, to_bytes(input_bytes))
 
 
+class BytesConcatenation(SupportsBytes, Sized, metaclass=ABCMeta):
+    """A class that can be concatenated with bytes."""
+
+    def __len__(self) -> int:
+        """Return length of the object when converted to bytes."""
+        return len(bytes(self))
+
+    def __add__(self, other: bytes | SupportsBytes) -> bytes:
+        """Concatenates the object with another bytes object."""
+        return bytes(self) + bytes(other)
+
+    def __radd__(self, other: bytes | SupportsBytes) -> bytes:
+        """Concatenates the object with another bytes object."""
+        return bytes(other) + bytes(self)
+
+
 class FixedSizeHexNumber(int, ToStringSchema):
     """
     A base class that helps represent an integer as a fixed byte-length

tests/benchmark/compute/helpers.py

@@ -4,17 +4,11 @@
 from enum import Enum, auto
 from typing import Sequence, cast
 
-from execution_testing import Fork, Hash, Op
+from execution_testing import BytesConcatenation, Fork, Hash, Op
 
-from tests.osaka.eip7951_p256verify_precompiles.spec import (
-    BytesConcatenation as P256BytesConcatenation,
-)
 from tests.osaka.eip7951_p256verify_precompiles.spec import (
     FieldElement,
 )
-from tests.prague.eip2537_bls_12_381_precompiles.spec import (
-    BytesConcatenation as BLSBytesConcatenation,
-)
 
 DEFAULT_BINOP_ARGS = (
     0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F,
@@ -98,10 +92,7 @@ def sar(x: int, s: int) -> int:
 
 def concatenate_parameters(
     parameters: (
-        Sequence[str]
-        | Sequence[P256BytesConcatenation]
-        | Sequence[BLSBytesConcatenation]
-        | Sequence[bytes]
+        Sequence[str] | Sequence[BytesConcatenation] | Sequence[bytes]
     ),
 ) -> bytes:
     """
@@ -124,8 +115,7 @@ def concatenate_parameters(
             p,
             (
                 bytes,
-                P256BytesConcatenation,
-                BLSBytesConcatenation,
+                BytesConcatenation,
                 FieldElement,
             ),
         )
@@ -134,12 +124,7 @@ def concatenate_parameters(
         parameters_bytes_list = [
             bytes(p)
             for p in cast(
-                Sequence[
-                    P256BytesConcatenation
-                    | BLSBytesConcatenation
-                    | bytes
-                    | FieldElement
-                ],
+                Sequence[BytesConcatenation | bytes | FieldElement],
                 parameters,
             )
         ]

tests/osaka/eip7951_p256verify_precompiles/spec.py

@@ -1,9 +1,8 @@
 """Defines EIP-7951 specification constants and functions."""
 
 from dataclasses import dataclass
-from typing import Sized, SupportsBytes
 
-from execution_testing import Address, Bytes
+from execution_testing import Address, Bytes, BytesConcatenation
 
 
 @dataclass(frozen=True)
@@ -19,22 +18,6 @@ class ReferenceSpec:
 )
 
 
-class BytesConcatenation(SupportsBytes, Sized):
-    """A class that can be concatenated with bytes."""
-
-    def __len__(self) -> int:
-        """Return length of the object when converted to bytes."""
-        return len(bytes(self))
-
-    def __add__(self, other: bytes | SupportsBytes) -> bytes:
-        """Concatenates the object with another bytes object."""
-        return bytes(self) + bytes(other)
-
-    def __radd__(self, other: bytes | SupportsBytes) -> bytes:
-        """Concatenates the object with another bytes object."""
-        return bytes(other) + bytes(self)
-
-
 @dataclass(frozen=True)
 class FieldElement(BytesConcatenation):
     """Dataclass that defines a single field element."""

tests/prague/eip2537_bls_12_381_precompiles/spec.py

@@ -2,7 +2,9 @@
 
 from dataclasses import dataclass
 from enum import Enum, auto
-from typing import Callable, Sized, SupportsBytes, Tuple
+from typing import Callable, Tuple
+
+from execution_testing import BytesConcatenation
 
 
 @dataclass(frozen=True)
@@ -18,22 +20,6 @@ class ReferenceSpec:
 )
 
 
-class BytesConcatenation(SupportsBytes, Sized):
-    """A class that can be concatenated with bytes."""
-
-    def __len__(self) -> int:
-        """Return length of the object when converted to bytes."""
-        return len(bytes(self))
-
-    def __add__(self, other: bytes | SupportsBytes) -> bytes:
-        """Concatenates the object with another bytes object."""
-        return bytes(self) + bytes(other)
-
-    def __radd__(self, other: bytes | SupportsBytes) -> bytes:
-        """Concatenates the object with another bytes object."""
-        return bytes(other) + bytes(self)
-
-
 @dataclass(frozen=True)
 class FP(BytesConcatenation):
     """Dataclass that defines a single element of Fp."""