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

Author: spencer-tb

tests/cancun/eip1153_tstore/__init__.py

@@ -1,6 +1,4 @@
-"""
-EIP-1153 Tests
-"""
+"""EIP-1153 Tests."""
 
 from enum import Enum, unique
 from pprint import pprint
@@ -49,50 +47,41 @@ def test_function(test_value):
     """
 
     def __init__(self, value):
+        """Initialize the enum value."""
         assert isinstance(value, dict)
         assert "description" in value
         self._value_ = value
 
     def param(self, names: List[str]):
-        """
-        Return the `pytest.param` value for this test case.
-        """
+        """Return the `pytest.param` value for this test case."""
         value = self._value_
         if "pytest_marks" in value:
             marks = {"marks": value["pytest_marks"]}
         else:
             marks = {}
         if "pytest_id" in value:
-            id = value["pytest_id"]
+            pytest_id = value["pytest_id"]
         else:
-            id = self.name.lower()
-        return pytest.param(*[value[name] for name in names], id=id, **marks)
+            pytest_id = self.name.lower()
+        return pytest.param(*[value[name] for name in names], id=pytest_id, **marks)
 
     @classmethod
     def special_keywords(cls) -> List[str]:
-        """
-        Return the special dictionary keywords that are not test parameters.
-        """
+        """Return the special dictionary keywords that are not test parameters."""
         return ["description", "pytest_marks", "pytest_id"]
 
     def names(self) -> List[str]:
-        """
-        Return the names of all the parameters included in the enum value dict.
-        """
+        """Return the names of all the parameters included in the enum value dict."""
         return sorted([k for k in self._value_.keys() if k not in self.special_keywords()])
 
     @property
     def description(self):
-        """
-        Returns the description of this test case.
-        """
+        """Returns the description of this test case."""
         return self._value_["description"]
 
     @classmethod
     def parametrize(cls):
-        """
-        Returns the decorator to parametrize a test with this enum.
-        """
+        """Return decorator to parametrize a test with this enum."""
         names = None
         for test_case_names in [test_case.names() for test_case in cls]:
             if names is None:

tests/cancun/eip1153_tstore/spec.py

@@ -1,14 +1,10 @@
-"""
-Defines EIP-1153 specification constants and functions.
-"""
+"""Defines EIP-1153 specification constants and functions."""
 from dataclasses import dataclass
 
 
 @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
@@ -21,7 +17,7 @@ class ReferenceSpec:
 class Spec:
     """
     Parameters from the EIP-1153 specifications as defined at
-    https://eips.ethereum.org/EIPS/eip-1153
+    https://eips.ethereum.org/EIPS/eip-1153.
     """
 
     TLOAD_OPCODE_BYTE = 0x5C

tests/cancun/eip1153_tstore/test_basic_tload.py

@@ -1,6 +1,6 @@
 """
 Ethereum Transient Storage EIP Tests
-https://eips.ethereum.org/EIPS/eip-1153
+https://eips.ethereum.org/EIPS/eip-1153.
 """
 
 from typing import Dict, Union
@@ -22,7 +22,7 @@ def test_basic_tload_transaction_begin(
     pre: Alloc,
 ):
     """
-    Ported .json vectors:
+    Ported .json vectors.
 
     (01_tloadBeginningTxnFiller.yml)
     load arbitrary value is 0 at beginning of transaction
@@ -67,7 +67,7 @@ def test_basic_tload_works(
     pre: Alloc,
 ):
     """
-    Ported .json vectors:
+    Ported .json vectors.
 
     (02_tloadAfterTstoreFiller.yml)
     tload from same slot after tstore returns correct value
@@ -119,7 +119,7 @@ def test_basic_tload_other_after_tstore(
     pre: Alloc,
 ):
     """
-    Ported .json vectors:
+    Ported .json vectors.
 
     (03_tloadAfterStoreIs0Filler.yml)
     Loading any other slot after storing to a slot returns 0.
@@ -167,7 +167,7 @@ def test_basic_tload_gasprice(
     pre: Alloc,
 ):
     """
-    Ported .json vectors:
+    Ported .json vectors.
 
     (16_tloadGasFiller.yml)
     tload costs 100 gas same as a warm sload
@@ -245,7 +245,7 @@ def test_basic_tload_after_store(
     pre: Alloc,
 ):
     """
-    Ported .json vectors:
+    Ported .json vectors.
 
     (18_tloadAfterStoreFiller.yml)
     tload from same slot after store returns 0

tests/cancun/eip1153_tstore/test_tload_calls.py

@@ -1,6 +1,6 @@
 """
 Ethereum Transient Storage EIP Tests
-https://eips.ethereum.org/EIPS/eip-1153
+https://eips.ethereum.org/EIPS/eip-1153.
 """
 
 import pytest
@@ -17,7 +17,7 @@
 @pytest.mark.parametrize("call_type", [Op.CALL, Op.CALLCODE, Op.DELEGATECALL])
 def test_tload_calls(state_test: StateTestFiller, pre: Alloc, call_type: Op):
     """
-    Ported .json vectors:
+    Ported .json vectors.
 
     (04_tloadAfterCallFiller.yml)
     Loading a slot after a call to another contract is 0.

tests/cancun/eip1153_tstore/test_tload_reentrancy.py

@@ -1,6 +1,6 @@
 """
 Ethereum Transient Storage EIP Tests
-https://eips.ethereum.org/EIPS/eip-1153
+https://eips.ethereum.org/EIPS/eip-1153.
 """
 
 from enum import Enum
@@ -27,7 +27,7 @@
 
 
 class CallDestType(Enum):
-    """Call dest type"""
+    """Call dest type."""
 
     REENTRANCY = 1
     EXTERNAL_CALL = 2
@@ -45,7 +45,7 @@ def test_tload_reentrancy(
     call_dest_type: CallDestType,
 ):
     """
-    Ported .json vectors:
+    Ported .json vectors.
 
     (05_tloadReentrancyFiller.yml)
     Reentrant calls access the same transient storage

tests/cancun/eip1153_tstore/test_tstorage.py

@@ -2,16 +2,23 @@
 abstract: Tests [EIP-1153: Transient Storage Opcodes](https://eips.ethereum.org/EIPS/eip-1153)
     Test [EIP-1153: Transient Storage Opcodes](https://eips.ethereum.org/EIPS/eip-1153). Ports
     and extends some tests from
-    [ethereum/tests/src/EIPTestsFiller/StateTests/stEIP1153-transientStorage/](https://github.com/ethereum/tests/blob/9b00b68593f5869eb51a6659e1cc983e875e616b/src/EIPTestsFiller/StateTests/stEIP1153-transientStorage)
+    [ethereum/tests/src/EIPTestsFiller/StateTests/stEIP1153-transientStorage/](https://github.com/ethereum/tests/blob/9b00b68593f5869eb51a6659e1cc983e875e616b/src/EIPTestsFiller/StateTests/stEIP1153-transientStorage).
 """  # noqa: E501
 
 from enum import unique
 
 import pytest
 
-from ethereum_test_tools import Account, Alloc, Bytecode, CodeGasMeasure, Environment
+from ethereum_test_tools import (
+    Account,
+    Alloc,
+    Bytecode,
+    CodeGasMeasure,
+    Environment,
+    StateTestFiller,
+    Transaction,
+)
 from ethereum_test_tools import Opcodes as Op
-from ethereum_test_tools import StateTestFiller, Transaction
 
 from . import PytestParameterEnum
 from .spec import Spec, ref_spec_1153
@@ -29,8 +36,8 @@ def test_transient_storage_unset_values(state_test: StateTestFiller, pre: Alloc)
     Test that tload returns zero for unset values. Loading an arbitrary value is
     0 at beginning of transaction: TLOAD(x) is 0.
 
-    Based on [ethereum/tests/.../01_tloadBeginningTxnFiller.yml](https://github.com/ethereum/tests/blob/9b00b68593f5869eb51a6659e1cc983e875e616b/src/EIPTestsFiller/StateTests/stEIP1153-transientStorage/01_tloadBeginningTxnFiller.yml)",  # noqa: E501
-    """
+    Based on [ethereum/tests/.../01_tloadBeginningTxnFiller.yml](https://github.com/ethereum/tests/blob/9b00b68593f5869eb51a6659e1cc983e875e616b/src/EIPTestsFiller/StateTests/stEIP1153-transientStorage/01_tloadBeginningTxnFiller.yml)",
+    """  # noqa: E501
     env = Environment()
 
     slots_under_test = [0, 1, 2, 2**128, 2**256 - 1]
@@ -62,8 +69,8 @@ def test_tload_after_tstore(state_test: StateTestFiller, pre: Alloc):
     Loading after storing returns the stored value: TSTORE(x, y), TLOAD(x)
     returns y.
 
-    Based on [ethereum/tests/.../02_tloadAfterTstoreFiller.yml](https://github.com/ethereum/tests/blob/9b00b68593f5869eb51a6659e1cc983e875e616b/src/EIPTestsFiller/StateTests/stEIP1153-transientStorage/02_tloadAfterTstoreFiller.yml)",  # noqa: E501
-    """
+    Based on [ethereum/tests/.../02_tloadAfterTstoreFiller.yml](https://github.com/ethereum/tests/blob/9b00b68593f5869eb51a6659e1cc983e875e616b/src/EIPTestsFiller/StateTests/stEIP1153-transientStorage/02_tloadAfterTstoreFiller.yml)",
+    """  # noqa: E501
     env = Environment()
 
     slots_under_test = [0, 1, 2, 2**128, 2**256 - 1]
@@ -96,8 +103,8 @@ def test_tload_after_sstore(state_test: StateTestFiller, pre: Alloc):
     Loading after storing returns the stored value: TSTORE(x, y), TLOAD(x)
     returns y.
 
-    Based on [ethereum/tests/.../18_tloadAfterStoreFiller.yml](https://github.com/ethereum/tests/blob/9b00b68593f5869eb51a6659e1cc983e875e616b/src/EIPTestsFiller/StateTests/stEIP1153-transientStorage/18_tloadAfterStoreFiller.yml)",  # noqa: E501
-    """
+    Based on [ethereum/tests/.../18_tloadAfterStoreFiller.yml](https://github.com/ethereum/tests/blob/9b00b68593f5869eb51a6659e1cc983e875e616b/src/EIPTestsFiller/StateTests/stEIP1153-transientStorage/18_tloadAfterStoreFiller.yml)",
+    """  # noqa: E501
     env = Environment()
 
     slots_under_test = [1, 3, 2**128, 2**256 - 1]
@@ -136,8 +143,8 @@ def test_tload_after_tstore_is_zero(state_test: StateTestFiller, pre: Alloc):
     """
     Test that tload returns zero after tstore is called with zero.
 
-    Based on [ethereum/tests/.../03_tloadAfterStoreIs0Filler.yml](https://github.com/ethereum/tests/blob/9b00b68593f5869eb51a6659e1cc983e875e616b/src/EIPTestsFiller/StateTests/stEIP1153-transientStorage/03_tloadAfterStoreIs0Filler.yml)",  # noqa: E501
-    """
+    Based on [ethereum/tests/.../03_tloadAfterStoreIs0Filler.yml](https://github.com/ethereum/tests/blob/9b00b68593f5869eb51a6659e1cc983e875e616b/src/EIPTestsFiller/StateTests/stEIP1153-transientStorage/03_tloadAfterStoreIs0Filler.yml)",
+    """  # noqa: E501
     env = Environment()
 
     slots_to_write = [1, 4, 2**128, 2**256 - 2]
@@ -175,9 +182,7 @@ def test_tload_after_tstore_is_zero(state_test: StateTestFiller, pre: Alloc):
 
 @unique
 class GasMeasureTestCases(PytestParameterEnum):
-    """
-    Test cases for gas measurement.
-    """
+    """Test cases for gas measurement."""
 
     TLOAD = {
         "description": "Test that tload() of an empty slot consumes the expected gas.",
@@ -218,9 +223,7 @@ def test_gas_usage(
     overhead_cost: int,
     extra_stack_items: int,
 ):
-    """
-    Test that tstore and tload consume the expected gas.
-    """
+    """Test that tstore and tload consume the expected gas."""
     gas_measure_bytecode = CodeGasMeasure(
         code=bytecode, overhead_cost=overhead_cost, extra_stack_items=extra_stack_items
     )
@@ -240,9 +243,7 @@ def test_gas_usage(
 
 @unique
 class LoopRunUntilOutOfGasCases(PytestParameterEnum):
-    """
-    Test cases to run until out of gas.
-    """
+    """Test cases to run until out of gas."""
 
     TSTORE = {
         "description": "Run tstore in loop until out of gas",
@@ -268,9 +269,7 @@ def test_run_until_out_of_gas(
     repeat_bytecode: Bytecode,
     bytecode_repeat_times: int,
 ):
-    """
-    Use TSTORE over and over to different keys until we run out of gas.
-    """
+    """Use TSTORE over and over to different keys until we run out of gas."""
     bytecode = Op.JUMPDEST + repeat_bytecode * bytecode_repeat_times + Op.JUMP(Op.PUSH0)
     code_address = pre.deploy_contract(code=bytecode)
     tx = Transaction(

tests/cancun/eip1153_tstore/test_tstorage_clear_after_tx.py

@@ -1,6 +1,6 @@
 """
 Ethereum Transient Storage EIP Tests
-https://eips.ethereum.org/EIPS/eip-1153
+https://eips.ethereum.org/EIPS/eip-1153.
 """
 
 from typing import Optional
@@ -34,7 +34,7 @@ def test_tstore_clear_after_deployment_tx(
     evm_code_type: EVMCodeType,
 ):
     """
-    This test first creates a contract, which TSTOREs a value 1 in slot 1.
+    First creates a contract, which TSTOREs a value 1 in slot 1.
     After creating the contract, a new tx will call this contract, storing TLOAD(1) into slot 1.
     The transient storage should be cleared after creating the contract (at tx-level), so
     the storage should stay empty.
@@ -81,7 +81,7 @@ def test_tstore_clear_after_tx(
     pre: Alloc,
 ):
     """
-    This test first SSTOREs the TLOAD value of key 1 in slot 1. Then, it TSTOREs 1 in slot 1.
+    First SSTOREs the TLOAD value of key 1 in slot 1. Then, it TSTOREs 1 in slot 1.
     The second tx will re-call the contract. The storage should stay empty,
     because the transient storage is cleared after the transaction.
     """

tests/cancun/eip1153_tstore/test_tstorage_create_contexts.py

@@ -7,9 +7,18 @@
 
 import pytest
 
-from ethereum_test_tools import Account, Address, Alloc, Bytecode, Environment, Initcode
+from ethereum_test_tools import (
+    Account,
+    Address,
+    Alloc,
+    Bytecode,
+    Environment,
+    Initcode,
+    StateTestFiller,
+    Transaction,
+    compute_create_address,
+)
 from ethereum_test_tools import Opcodes as Op
-from ethereum_test_tools import StateTestFiller, Transaction, compute_create_address
 
 from . import CreateOpcodeParams, PytestParameterEnum
 from .spec import ref_spec_1153
@@ -116,8 +125,7 @@ class InitcodeTestCases(PytestParameterEnum):
 @InitcodeTestCases.parametrize()
 class TestTransientStorageInContractCreation:
     """
-    Test transient storage in contract creation contexts:
-
+    Test transient storage in contract creation contexts.
     - TSTORE/TLOAD in initcode should not be able to access the creator's transient storage.
     - TSTORE/TLOAD in initcode should be able to access the created contract's transient
         storage.
@@ -157,7 +165,7 @@ def creator_contract_code(  # noqa: D102
 
     @pytest.fixture()
     def creator_address(self, pre: Alloc, creator_contract_code: Bytecode) -> Address:
-        """The address that creates the contract with create/create2"""
+        """Address that creates the contract with create/create2."""
         return pre.deploy_contract(creator_contract_code)
 
     @pytest.fixture()
@@ -187,9 +195,7 @@ def test_contract_creation(
         expected_creator_storage: dict,
         expected_storage: dict,
     ) -> None:
-        """
-        Test transient storage in contract creation contexts.
-        """
+        """Test transient storage in contract creation contexts."""
         sender = pre.fund_eoa()
 
         tx = Transaction(