added type hints like there is no tomorrow

Author: felix314159

tests/prague/eip7685_general_purpose_el_requests/test_deposits_withdrawals_consolidations.py

@@ -9,6 +9,7 @@
 
 import pytest
 
+from ethereum_test_base_types.base_types import Address
 from ethereum_test_forks import Fork
 from ethereum_test_tools import (
     Account,
@@ -27,6 +28,7 @@
 )
 from ethereum_test_tools import Opcodes as Op
 from ethereum_test_tools.utility.pytest import ParameterSet
+from ethereum_test_types.types import EOA
 
 from ..eip6110_deposits.helpers import DepositContract, DepositRequest, DepositTransaction
 from ..eip6110_deposits.spec import Spec as Spec_EIP6110
@@ -44,10 +46,10 @@
 from ..eip7251_consolidations.spec import Spec as Spec_EIP7251
 from .spec import ref_spec_7685
 
-REFERENCE_SPEC_GIT_PATH = ref_spec_7685.git_path
-REFERENCE_SPEC_VERSION = ref_spec_7685.version
+REFERENCE_SPEC_GIT_PATH: str = ref_spec_7685.git_path
+REFERENCE_SPEC_VERSION: str = ref_spec_7685.version
 
-pytestmark = pytest.mark.valid_from("Prague")
+pytestmark: pytest.MarkDecorator = pytest.mark.valid_from("Prague")
 
 
 def single_deposit(i: int) -> DepositRequest:  # noqa: D103
@@ -108,7 +110,7 @@ def get_permutations(
     None,
 ]:
     """Return possible permutations of the requests from an EOA."""
-    requests = [
+    requests: list = [
         (
             "deposit",
             single_deposit(0),
@@ -128,7 +130,7 @@ def get_permutations(
 
 def get_eoa_permutations(n: int = 3) -> Generator[ParameterSet, None, None]:
     """Return possible permutations of the requests from an EOA."""
-    requests = [
+    requests: list = [
         (
             "deposit_from_eoa",
             single_deposit_from_eoa(0),
@@ -148,7 +150,7 @@ def get_eoa_permutations(n: int = 3) -> Generator[ParameterSet, None, None]:
 
 def get_contract_permutations(n: int = 3) -> Generator[ParameterSet, None, None]:
     """Return possible permutations of the requests from a contract."""
-    requests = [
+    requests: list = [
         (
             "deposit_from_contract",
             single_deposit_from_contract(0),
@@ -377,23 +379,23 @@ def test_valid_deposit_withdrawal_consolidation_request_from_same_tx(
     Test making a deposit to the beacon chain deposit contract and a withdrawal in
     the same tx.
     """
-    withdrawal_request_fee = 1
-    consolidation_request_fee = 1
+    withdrawal_request_fee: int = 1
+    consolidation_request_fee: int = 1
 
-    calldata = b""
-    contract_code = Bytecode()
-    total_value = 0
-    storage = Storage()
+    calldata: bytes = b""
+    contract_code: Bytecode = Bytecode()
+    total_value: int = 0
+    storage: Storage = Storage()
 
     for request in requests:
-        calldata_start = len(calldata)
-        current_calldata = request.calldata
+        calldata_start: int = len(calldata)
+        current_calldata: bytes = request.calldata
         calldata += current_calldata
 
         contract_code += Op.CALLDATACOPY(0, calldata_start, len(current_calldata))
 
-        call_contract_address = 0
-        value = 0
+        call_contract_address: int = 0
+        value: int = 0
         if isinstance(request, DepositRequest):
             call_contract_address = Spec_EIP6110.DEPOSIT_CONTRACT_ADDRESS
             value = request.value
@@ -416,12 +418,12 @@ def test_valid_deposit_withdrawal_consolidation_request_from_same_tx(
             ),
         )
 
-    sender = pre.fund_eoa()
-    contract_address = pre.deploy_contract(
+    sender: EOA = pre.fund_eoa()
+    contract_address: Address = pre.deploy_contract(
         code=contract_code,
     )
 
-    tx = Transaction(
+    tx: Transaction = Transaction(
         gas_limit=10_000_000,
         to=contract_address,
         value=total_value,
@@ -486,15 +488,15 @@ def invalid_requests_block_combinations(fork: Fork) -> List[ParameterSet]:
     }
 
     # - Empty requests list with invalid hash
-    combinations = [
+    combinations: List[ParameterSet] = [
         pytest.param(
             [],
             [
                 bytes([i]) for i in range(fork.max_request_type() + 1)
             ],  # Using empty requests, calculate the hash using an invalid calculation method:
-            # sha256(sha256(b"\0") ++ sha256(b"\1") ++ sha256(b"\2") ++ ...)
+            # sha256(sha256(b'0x00') ++ sha256(b'0x01') ++ sha256(b'0x02') ++ ...)
             BlockException.INVALID_REQUESTS,
-            id="no_requests_invalid_hash_calculation_method",
+            id="no_requests_and_invalid_hash_calculation_method",
         ),
         pytest.param(
             [],
@@ -503,7 +505,7 @@ def invalid_requests_block_combinations(fork: Fork) -> List[ParameterSet]:
             ],  # Using empty requests, calculate the hash using an invalid calculation method:
             # sha256(sha256(b"") ++ sha256(b"") ++ sha256(b"") ++ ...)
             BlockException.INVALID_REQUESTS,
-            id="no_requests_invalid_hash_calculation_method_2",
+            id="no_requests_and_invalid_hash_calculation_method_2",
         ),
     ]