chore: mypy fixes part 1.

Author: spencer-tb

src/cli/check_fixtures.py

@@ -11,7 +11,7 @@
 
 from ethereum_test_base_types import to_json
 from ethereum_test_fixtures.file import Fixtures
-from ethereum_test_specs.base import HashMismatchException
+from ethereum_test_specs.base import HashMismatchExceptionError
 
 
 def count_json_files_exclude_index(start_path: Path) -> int:
@@ -42,13 +42,13 @@ def check_json(json_file_path: Path):
     for fixture_name, fixture in fixtures.items():
         new_hash = fixtures_deserialized[fixture_name].hash
         if (original_hash := fixture.hash) != new_hash:
-            raise HashMismatchException(
+            raise HashMismatchExceptionError(
                 original_hash,
                 new_hash,
                 message=f"Fixture hash attributes do not match for {fixture_name}",
             )
         if "hash" in fixture.info and fixture.info["hash"] != original_hash:
-            raise HashMismatchException(
+            raise HashMismatchExceptionError(
                 original_hash,
                 fixture.info["hash"],
                 message=f"Fixture info['hash'] does not match calculated hash for {fixture_name}",

src/cli/eofwrap.py

@@ -298,7 +298,7 @@ def _wrap_fixture(self, fixture: BlockchainFixture, traces: bool):
     def _validate_eof(self, container: Container, metrics: bool = True) -> bool:
         eof_parse = EOFParse()
 
-        result = eof_parse.run(input=to_hex(container))
+        result = eof_parse.run(input_value=to_hex(container))
         actual_message = result.stdout.strip()
         if "OK" not in actual_message:
             if metrics:

src/ethereum_test_rpc/rpc.py

@@ -45,7 +45,7 @@ class BaseRPC:
 
     namespace: ClassVar[str]
 
-    def __init__(self, url: str, extra_headers: Dict = None):
+    def __init__(self, url: str, extra_headers: Dict | None = None):
         """Initialize BaseRPC class with the given url."""
         if extra_headers is None:
             extra_headers = {}
@@ -60,7 +60,7 @@ def __init_subclass__(cls) -> None:
             namespace = namespace[:-3]
         cls.namespace = namespace.lower()
 
-    def post_request(self, method: str, *params: Any, extra_headers: Dict = None) -> Any:
+    def post_request(self, method: str, *params: Any, extra_headers: Dict | None = None) -> Any:
         """Send JSON-RPC POST request to the client RPC server at port defined in the url."""
         if extra_headers is None:
             extra_headers = {}
@@ -101,7 +101,7 @@ class EthRPC(BaseRPC):
     BlockNumberType = Union[int, Literal["latest", "earliest", "pending"]]
 
     def __init__(
-        self, url: str, extra_headers: Dict = None, *, transaction_wait_timeout: int = 60
+        self, url: str, extra_headers: Dict | None = None, *, transaction_wait_timeout: int = 60
     ):
         """Initialize EthRPC class with the given url and transaction wait timeout."""
         if extra_headers is None:
@@ -257,7 +257,7 @@ class EngineRPC(BaseRPC):
     simulators.
     """
 
-    def post_request(self, method: str, *params: Any, extra_headers: Dict = None) -> Any:
+    def post_request(self, method: str, *params: Any, extra_headers: Dict | None = None) -> Any:
         """Send JSON-RPC POST request to the client RPC server at port defined in the url."""
         if extra_headers is None:
             extra_headers = {}

src/ethereum_test_specs/eof.py

@@ -225,7 +225,7 @@ def make_eof_test_fixture(
             args = []
             if vector.container_kind == ContainerKind.INITCODE:
                 args.append("--initcode")
-            result = eof_parse.run(*args, input=str(vector.code))
+            result = eof_parse.run(*args, input_value=str(vector.code))
             self.verify_result(result, expected_result, vector.code)
 
         return fixture

src/ethereum_test_specs/tests/test_expect.py

@@ -224,7 +224,7 @@ def test_post_balance_value_mismatch(pre: Alloc, post: Alloc, state_test, t8n, f
         (
             {ADDRESS_UNDER_TEST: Account(balance=1)},
             {ADDRESS_UNDER_TEST: Account(balance=1), Address(0x02): Account(balance=1)},
-            Alloc.MissingAccount,
+            Alloc.MissingAccountError,
         ),
         (
             {ADDRESS_UNDER_TEST: Account(balance=1)},
@@ -234,7 +234,7 @@ def test_post_balance_value_mismatch(pre: Alloc, post: Alloc, state_test, t8n, f
         (
             {ADDRESS_UNDER_TEST: Account(balance=1)},
             {ADDRESS_UNDER_TEST: Account.NONEXISTENT},
-            Alloc.UnexpectedAccount,
+            Alloc.UnexpectedAccountError,
         ),
     ],
     indirect=["pre", "post"],

src/ethereum_test_tools/code/generators.py

@@ -43,9 +43,9 @@ class Initcode(Bytecode):
     def __new__(
         cls,
         *,
-        deploy_code: SupportsBytes | Bytes = None,
+        deploy_code: SupportsBytes | Bytes | None = None,
         initcode_length: int | None = None,
-        initcode_prefix: Bytecode = None,
+        initcode_prefix: Bytecode | None = None,
         initcode_prefix_execution_gas: int = 0,
         padding_byte: int = 0x00,
         name: str = "",
@@ -195,8 +195,8 @@ def __new__(
         cls,
         *,
         condition: Bytecode | Op,
-        if_true: Bytecode | Op = None,
-        if_false: Bytecode | Op = None,
+        if_true: Bytecode | Op | None = None,
+        if_false: Bytecode | Op | None = None,
         evm_code_type: EVMCodeType = EVMCodeType.LEGACY,
     ):
         """

src/ethereum_test_types/eof/v1/__init__.py

@@ -257,7 +257,7 @@ def list_header(sections: List["Section"]) -> bytes:
 
     @classmethod
     def Code(  # noqa: N802
-        cls, code: BytesConvertible | Bytecode = None, **kwargs
+        cls, code: Optional[BytesConvertible | Bytecode] = None, **kwargs
     ) -> "Section":
         """Create new code section with the specified code."""
         if code is None:
@@ -435,7 +435,7 @@ def bytecode(self) -> bytes:
         return c
 
     @classmethod
-    def Code(cls, code: BytesConvertible = None, **kwargs) -> "Container":  # noqa: N802
+    def Code(cls, code: Optional[BytesConvertible] = None, **kwargs) -> "Container":  # noqa: N802
         """Create simple container with a single code section."""
         if code is None:
             code = Bytecode()
@@ -446,7 +446,7 @@ def Code(cls, code: BytesConvertible = None, **kwargs) -> "Container":  # noqa:
     def Init(  # noqa: N802
         cls,
         deploy_container: "Container",
-        initcode_prefix: Bytecode = None,
+        initcode_prefix: Optional[Bytecode] = None,
     ) -> "Container":
         """Create simple init container that deploys the specified container."""
         if initcode_prefix is None:

src/ethereum_test_types/tests/test_post_alloc.py

@@ -34,25 +34,25 @@ def alloc(request: pytest.FixtureRequest) -> Alloc:
                     "storage": {0: 1},
                 }
             },
-            Alloc.UnexpectedAccount,
+            Alloc.UnexpectedAccountError,
         ),
         # Account should not exist but contained in alloc
         (
             {"0x00": Account.NONEXISTENT},
             {"0x0": {"nonce": "1"}},
-            Alloc.UnexpectedAccount,
+            Alloc.UnexpectedAccountError,
         ),
         # Account should not exist but contained in alloc
         (
             {"0x1": Account.NONEXISTENT},
             {"0x01": {"balance": "1"}},
-            Alloc.UnexpectedAccount,
+            Alloc.UnexpectedAccountError,
         ),
         # Account should not exist but contained in alloc
         (
             {"0x0a": Account.NONEXISTENT},
             {"0x0A": {"code": "0x00"}},
-            Alloc.UnexpectedAccount,
+            Alloc.UnexpectedAccountError,
         ),
         # Account should exist but not in alloc
         (
@@ -65,7 +65,7 @@ def alloc(request: pytest.FixtureRequest) -> Alloc:
                     "storage": {0: 1},
                 }
             },
-            Alloc.MissingAccount,
+            Alloc.MissingAccountError,
         ),
         # Account should exist and contained in alloc, but don't care about
         # values

src/ethereum_test_types/tests/test_types.py

@@ -623,25 +623,25 @@ def test_json_deserialization(
     [
         pytest.param(
             {"gas_price": 1, "max_fee_per_gas": 2},
-            Transaction.InvalidFeePayment,
+            Transaction.InvalidFeePaymentError,
             "only one type of fee payment field can be used",
             id="gas-price-and-max-fee-per-gas",
         ),
         pytest.param(
             {"gas_price": 1, "max_priority_fee_per_gas": 2},
-            Transaction.InvalidFeePayment,
+            Transaction.InvalidFeePaymentError,
             "only one type of fee payment field can be used",
             id="gas-price-and-max-priority-fee-per-gas",
         ),
         pytest.param(
             {"gas_price": 1, "max_fee_per_blob_gas": 2},
-            Transaction.InvalidFeePayment,
+            Transaction.InvalidFeePaymentError,
             "only one type of fee payment field can be used",
             id="gas-price-and-max-fee-per-blob-gas",
         ),
         pytest.param(
             {"ty": 0, "v": 1, "secret_key": 2},
-            Transaction.InvalidSignaturePrivateKey,
+            Transaction.InvalidSignaturePrivateKeyError,
             "can't define both 'signature' and 'private_key'",
             id="type0-signature-and-secret-key",
         ),

src/ethereum_test_types/types.py

@@ -245,21 +245,21 @@ def verify_post_alloc(self, got_alloc: "Alloc"):
             if account is None:
                 # Account must not exist
                 if address in got_alloc.root and got_alloc.root[address] is not None:
-                    raise Alloc.UnexpectedAccount(address, got_alloc.root[address])
+                    raise Alloc.UnexpectedAccountError(address, got_alloc.root[address])
             else:
                 if address in got_alloc.root:
                     got_account = got_alloc.root[address]
                     assert isinstance(got_account, Account)
                     assert isinstance(account, Account)
                     account.check_alloc(address, got_account)
                 else:
-                    raise Alloc.MissingAccount(address)
+                    raise Alloc.MissingAccountError(address)
 
     def deploy_contract(
         self,
         code: BytesConvertible,
         *,
-        storage: Storage | StorageRootType = None,
+        storage: Storage | StorageRootType | None = None,
         balance: NumberConvertible = 0,
         nonce: NumberConvertible = 1,
         address: Address | None = None,