chore: mypy fixes part 2.

Author: spencer-tb

src/cli/check_fixtures.py

@@ -109,7 +109,7 @@ def get_input_files() -> Generator[Path, None, None]:
         TimeElapsedColumn(),
         expand=True,
         disable=quiet_mode,
-    ) as progress:
+    ) as progress:  # type: Progress
         task_id = progress.add_task("Checking fixtures", total=file_count, filename="...")
         for json_file_path in get_input_files():
             if json_file_path.name == "index.json":

src/cli/gen_index.py

@@ -159,7 +159,7 @@ def generate_fixtures_index(
         TimeElapsedColumn(),
         expand=False,
         disable=quiet_mode,
-    ) as progress:
+    ) as progress:  # type: Progress
         task_id = progress.add_task("[cyan]Processing files...", total=total_files, filename="...")
 
         test_cases: List[TestCaseIndexFile] = []

src/ethereum_clis/tests/test_execution_specs.py

@@ -12,7 +12,7 @@
 
 from ethereum_clis import ExecutionSpecsTransitionTool, TransitionTool
 from ethereum_test_base_types import to_json
-from ethereum_test_forks import Berlin, Istanbul, London
+from ethereum_test_forks import Berlin, Fork, Istanbul, London
 from ethereum_test_types import Alloc, Environment, Transaction
 
 FIXTURES_ROOT = Path(os.path.join("src", "ethereum_clis", "tests", "fixtures"))
@@ -37,7 +37,7 @@ def monkeypatch_path_for_entry_points(monkeypatch):
 @pytest.mark.parametrize("t8n", [ExecutionSpecsTransitionTool()])
 @pytest.mark.parametrize("fork", [London, Istanbul])
 @pytest.mark.parametrize(
-    "alloc,base_fee,hash",
+    "alloc,base_fee,expected_hash",
     [
         (
             {
@@ -87,6 +87,8 @@ def monkeypatch_path_for_entry_points(monkeypatch):
     ],
 )
 def test_calc_state_root(
+    t8n: TransitionTool,
+    fork: Fork,
     alloc: Dict,
     base_fee: int | None,
     expected_hash: bytes,

src/ethereum_test_base_types/base_types.py

@@ -68,8 +68,8 @@ class Wei(Number):
 
     def __new__(cls, input_number: NumberConvertible | N):
         """Create a new Number object."""
-        if isinstance(input, str):
-            words = input.split()
+        if isinstance(input_number, str):
+            words = input_number.split()
             multiplier = 1
             assert len(words) <= 2
             value_str = words[0]

src/ethereum_test_forks/tests/test_forks.py

@@ -204,13 +204,11 @@ def test_pre_alloc():  # noqa: D103
 
 
 def test_precompiles():  # noqa: D103
-    assert (
-        Cancun.precompiles() == list(range(11))[1:]
-    ), "Precompiles do not match the expected range"
+    Cancun.precompiles() == list(range(11))[1:]  # noqa: B015
 
 
 def test_tx_types():  # noqa: D103
-    assert Cancun.tx_types() == list(range(4)), "Transaction types do not match the expected range"
+    Cancun.tx_types() == list(range(4))  # noqa: B015
 
 
 def test_solc_versioning():  # noqa: D103

src/pytest_plugins/execute/sender.py

@@ -5,7 +5,7 @@
 
 import pytest
 from filelock import FileLock
-from pytest_metadata.plugin import metadata_key
+from pytest_metadata.plugin import metadata_key  # type: ignore
 
 from ethereum_test_base_types import Number, Wei
 from ethereum_test_rpc import EthRPC