chore(ruff): changes to tests/prague/.

Author: spencer-tb

tests/prague/eip2537_bls_12_381_precompiles/conftest.py

@@ -1,28 +1,25 @@
-"""
-Shared pytest definitions local to EIP-2537 tests.
-"""
+"""Shared pytest definitions local to EIP-2537 tests."""
 
 from typing import SupportsBytes
 
 import pytest
 
-from ethereum_test_tools import EOA, Address, Alloc, Bytecode
+from ethereum_test_tools import EOA, Address, Alloc, Bytecode, Storage, Transaction, keccak256
 from ethereum_test_tools import Opcodes as Op
-from ethereum_test_tools import Storage, Transaction, keccak256
 
 from .spec import GAS_CALCULATION_FUNCTION_MAP
 
 
 @pytest.fixture
-def precompile_gas(precompile_address: int, input: bytes) -> int:
+def precompile_gas(precompile_address: int, input_value: bytes) -> int:
     """Gas cost for the precompile."""
-    return GAS_CALCULATION_FUNCTION_MAP[precompile_address](len(input))
+    return GAS_CALCULATION_FUNCTION_MAP[precompile_address](len(input_value))
 
 
 @pytest.fixture
 def precompile_gas_modifier() -> int:
     """
-    Used to modify the gas passed to the precompile, for testing purposes.
+    Modify the gas passed to the precompile, for testing purposes.
 
     By default the call is made with the exact gas amount required for the given opcode,
     but when this fixture is overridden, the gas amount can be modified to, e.g., test
@@ -93,6 +90,7 @@ def call_contract_code(
             Op.STATICCALL).
         call_contract_post_storage:
             Storage of the test contract after the transaction is executed.
+
     """
     expected_output = bytes(expected_output)
 
@@ -152,23 +150,21 @@ def post(call_contract_address: Address, call_contract_post_storage: Storage):
 
 @pytest.fixture
 def tx_gas_limit(precompile_gas: int) -> int:
-    """
-    Transaction gas limit used for the test (Can be overridden in the test).
-    """
+    """Transaction gas limit used for the test (Can be overridden in the test)."""
     return 10_000_000 + precompile_gas
 
 
 @pytest.fixture
 def tx(
-    input: bytes,
+    input_data: bytes,
     tx_gas_limit: int,
     call_contract_address: Address,
     sender: EOA,
 ) -> Transaction:
     """Transaction for the test."""
     return Transaction(
         gas_limit=tx_gas_limit,
-        input=input,
+        data=input_data,
         to=call_contract_address,
         sender=sender,
     )

tests/prague/eip2537_bls_12_381_precompiles/helpers.py

@@ -1,6 +1,4 @@
-"""
-Helper functions for the EIP-2537 BLS12-381 precompiles tests.
-"""
+"""Helper functions for the EIP-2537 BLS12-381 precompiles tests."""
 import os
 from typing import Annotated, List
 
@@ -10,16 +8,12 @@
 
 
 def current_python_script_directory(*args: str) -> str:
-    """
-    Get the current Python script directory, optionally appending additional path components.
-    """
+    """Get the current Python script directory, optionally appending additional path components."""
     return os.path.join(os.path.dirname(os.path.realpath(__file__)), *args)
 
 
 class Vector(BaseModel):
-    """
-    Test vector for the BLS12-381 precompiles.
-    """
+    """Test vector for the BLS12-381 precompiles."""
 
     input: Annotated[bytes, BeforeValidator(bytes.fromhex)]
     expected: Annotated[bytes, BeforeValidator(bytes.fromhex)]
@@ -29,16 +23,12 @@ class Vector(BaseModel):
     model_config = ConfigDict(alias_generator=to_pascal)
 
     def to_pytest_param(self):
-        """
-        Convert the test vector to a tuple that can be used as a parameter in a pytest test.
-        """
+        """Convert the test vector to a tuple that can be used as a parameter in a pytest test."""
         return pytest.param(self.input, self.expected, id=self.name)
 
 
 class FailVector(BaseModel):
-    """
-    Test vector for the BLS12-381 precompiles.
-    """
+    """Test vector for the BLS12-381 precompiles."""
 
     input: Annotated[bytes, BeforeValidator(bytes.fromhex)]
     expected_error: str
@@ -47,16 +37,12 @@ class FailVector(BaseModel):
     model_config = ConfigDict(alias_generator=to_pascal)
 
     def to_pytest_param(self):
-        """
-        Convert the test vector to a tuple that can be used as a parameter in a pytest test.
-        """
+        """Convert the test vector to a tuple that can be used as a parameter in a pytest test."""
         return pytest.param(self.input, id=self.name)
 
 
 class VectorList(RootModel):
-    """
-    List of test vectors for the BLS12-381 precompiles.
-    """
+    """List of test vectors for the BLS12-381 precompiles."""
 
     root: List[Vector | FailVector]
 
@@ -65,9 +51,7 @@ class VectorList(RootModel):
 
 
 def vectors_from_file(filename: str) -> List:
-    """
-    Load test vectors from a file.
-    """
+    """Load test vectors from a file."""
     with open(
         current_python_script_directory(
             "vectors",

tests/prague/eip2537_bls_12_381_precompiles/spec.py

@@ -1,6 +1,5 @@
-"""
-Defines EIP-2537 specification constants and functions.
-"""
+"""Defines EIP-2537 specification constants and functions."""
+
 import json
 from dataclasses import dataclass
 from typing import Callable, List, Sized, SupportsBytes, Tuple
@@ -10,9 +9,7 @@
 
 @dataclass(frozen=True)
 class ReferenceSpec:
-    """
-    Defines the reference spec version and git path.
-    """
+    """Defines the reference spec version and git path."""
 
     git_path: str
     version: str
@@ -22,12 +19,10 @@ class ReferenceSpec:
 
 
 class BytesConcatenation(SupportsBytes, Sized):
-    """
-    A class that can be concatenated with bytes.
-    """
+    """A class that can be concatenated with bytes."""
 
     def __len__(self) -> int:
-        """Returns the length of the object when converted to bytes."""
+        """Return length of the object when converted to bytes."""
         return len(bytes(self))
 
     def __add__(self, other: bytes | SupportsBytes) -> bytes:
@@ -46,7 +41,7 @@ class FP(BytesConcatenation):
     x: int = 0
 
     def __bytes__(self) -> bytes:
-        """Converts the field element to bytes."""
+        """Convert field element to bytes."""
         return self.x.to_bytes(64, byteorder="big")
 
 
@@ -58,7 +53,7 @@ class PointG1(BytesConcatenation):
     y: int = 0
 
     def __bytes__(self) -> bytes:
-        """Converts the point to bytes."""
+        """Convert point to bytes."""
         return self.x.to_bytes(64, byteorder="big") + self.y.to_bytes(64, byteorder="big")
 
     def __neg__(self):
@@ -73,7 +68,7 @@ class FP2(BytesConcatenation):
     x: Tuple[int, int] = (0, 0)
 
     def __bytes__(self) -> bytes:
-        """Converts the field element to bytes."""
+        """Convert field element to bytes."""
         return self.x[0].to_bytes(64, byteorder="big") + self.x[1].to_bytes(64, byteorder="big")
 
 
@@ -85,7 +80,7 @@ class PointG2(BytesConcatenation):
     y: Tuple[int, int] = (0, 0)
 
     def __bytes__(self) -> bytes:
-        """Converts the point to bytes."""
+        """Convert point to bytes."""
         return (
             self.x[0].to_bytes(64, byteorder="big")
             + self.x[1].to_bytes(64, byteorder="big")
@@ -105,7 +100,7 @@ class Scalar(BytesConcatenation):
     x: int = 0
 
     def __bytes__(self) -> bytes:
-        """Converts the scalar to bytes."""
+        """Convert scalar to bytes."""
         return self.x.to_bytes(32, byteorder="big")
 
 
@@ -118,7 +113,7 @@ def __bytes__(self) -> bytes:
 class Spec:
     """
     Parameters from the EIP-2537 specifications as defined at
-    https://eips.ethereum.org/EIPS/eip-2537
+    https://eips.ethereum.org/EIPS/eip-2537.
     """
 
     # Addresses
@@ -218,22 +213,18 @@ class Spec:
 
 
 def msm_discount(k: int) -> int:
-    """
-    Returns the discount for the G1MSM and G2MSM precompiles.
-    """
+    """Return discount for the G1MSM and G2MSM precompiles."""
     return Spec.MSM_DISCOUNT_TABLE[min(k, 128)]
 
 
 def msm_gas_func_gen(len_per_pair: int, multiplication_cost: int) -> Callable[[int], int]:
     """
-    Generates a function that calculates the gas cost for the G1MSM and G2MSM
+    Generate function that calculates the gas cost for the G1MSM and G2MSM
     precompiles.
     """
 
     def msm_gas(input_length: int) -> int:
-        """
-        Calculates the gas cost for the G1MSM and G2MSM precompiles.
-        """
+        """Calculate gas cost for the G1MSM and G2MSM precompiles."""
         k = input_length // len_per_pair
         if k == 0:
             return 0
@@ -246,9 +237,7 @@ def msm_gas(input_length: int) -> int:
 
 
 def pairing_gas(input_length: int) -> int:
-    """
-    Calculates the gas cost for the PAIRING precompile.
-    """
+    """Calculate gas cost for the PAIRING precompile."""
     k = input_length // Spec.LEN_PER_PAIR
     return (Spec.PAIRING_PER_PAIR_GAS * k) + Spec.PAIRING_BASE_GAS
 

tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1add.py

@@ -5,9 +5,8 @@
 
 import pytest
 
-from ethereum_test_tools import Alloc, Environment
+from ethereum_test_tools import Alloc, Environment, StateTestFiller, Transaction
 from ethereum_test_tools import Opcodes as Op
-from ethereum_test_tools import StateTestFiller, Transaction
 
 from .helpers import vectors_from_file
 from .spec import PointG1, Spec, ref_spec_2537
@@ -22,7 +21,7 @@
 
 
 @pytest.mark.parametrize(
-    "input,expected_output",
+    "input_value,expected_output",
     vectors_from_file("add_G1_bls.json")
     + [
         pytest.param(
@@ -48,9 +47,7 @@ def test_valid(
     post: dict,
     tx: Transaction,
 ):
-    """
-    Test the BLS12_G1ADD precompile.
-    """
+    """Test the BLS12_G1ADD precompile."""
     state_test(
         env=Environment(),
         pre=pre,
@@ -60,7 +57,7 @@ def test_valid(
 
 
 @pytest.mark.parametrize(
-    "input",
+    "input_value",
     vectors_from_file("fail-add_G1_bls.json")
     + [
         pytest.param(
@@ -156,9 +153,7 @@ def test_invalid(
     post: dict,
     tx: Transaction,
 ):
-    """
-    Negative tests for the BLS12_G1ADD precompile.
-    """
+    """Negative tests for the BLS12_G1ADD precompile."""
     state_test(
         env=Environment(),
         pre=pre,
@@ -168,7 +163,7 @@ def test_invalid(
 
 
 @pytest.mark.parametrize(
-    "input,expected_output,precompile_gas_modifier",
+    "input_value,expected_output,precompile_gas_modifier",
     [
         pytest.param(
             Spec.INF_G1 + Spec.INF_G1,
@@ -190,9 +185,7 @@ def test_gas(
     post: dict,
     tx: Transaction,
 ):
-    """
-    Test the BLS12_G1ADD precompile gas requirements.
-    """
+    """Test the BLS12_G1ADD precompile gas requirements."""
     state_test(
         env=Environment(),
         pre=pre,
@@ -210,7 +203,7 @@ def test_gas(
     ],
 )
 @pytest.mark.parametrize(
-    "input,expected_output",
+    "input_value,expected_output",
     [
         pytest.param(
             Spec.INF_G1 + Spec.INF_G1,
@@ -225,9 +218,7 @@ def test_call_types(
     post: dict,
     tx: Transaction,
 ):
-    """
-    Test the BLS12_G1ADD precompile using different call types.
-    """
+    """Test the BLS12_G1ADD precompile using different call types."""
     state_test(
         env=Environment(),
         pre=pre,