parameterized test and bugfixes

Author: felix314159

tests/prague/eip7002_el_triggerable_withdrawals/test_modified_withdrawal_contract.py

@@ -6,6 +6,8 @@
 
 from typing import List
 
+import pytest
+
 from ethereum_test_tools import (
     Account,
     Alloc,
@@ -15,38 +17,72 @@
 )
 from ethereum_test_types import Requests
 
-from ..eip7002_el_triggerable_withdrawals.helpers import (
+from .helpers import (
     WithdrawalRequest,
     # WithdrawalRequestBase,
     # WithdrawalRequestContract,
     WithdrawalRequestTransaction,
 )
-from ..eip7002_el_triggerable_withdrawals.spec import Spec as Spec_EIP7002
+from .spec import Spec as Spec_EIP7002
 from .spec import ref_spec_7002
 
 REFERENCE_SPEC_GIT_PATH: str = ref_spec_7002.git_path
 REFERENCE_SPEC_VERSION: str = ref_spec_7002.version
 
 
-# @pytest.mark.parametrize(
-#     "requests_list",
-#     [
-#         WithdrawalRequest(
-#             validator_pubkey=0x01,
-#             amount=0,
-#             fee=Spec_EIP7002.get_fee(0),
-#         ),
-#         WithdrawalRequest(
-#             validator_pubkey=0x01,
-#             amount=0,
-#             fee=Spec_EIP7002.get_fee(0),
-#         ),
-#     ],
-# )
+def single_withdrawal_with_custom_fee(i: int) -> WithdrawalRequest:  # noqa: D103
+    return WithdrawalRequest(
+        validator_pubkey=i + 1,
+        amount=0,
+        fee=Spec_EIP7002.get_fee(0),
+    )
+
+
+@pytest.mark.parametrize(
+    "requests_list",
+    [
+        pytest.param(
+            [
+                *[
+                    single_withdrawal_with_custom_fee(i)
+                    for i in range(
+                        0,
+                        16,
+                    )
+                ],
+            ],
+            id="16_withdrawal_requests",
+        ),
+        pytest.param(
+            [
+                *[
+                    single_withdrawal_with_custom_fee(i)
+                    for i in range(
+                        0,
+                        17,
+                    )
+                ],
+            ],
+            id="17_withdrawal_requests",
+        ),
+        pytest.param(
+            [
+                *[
+                    single_withdrawal_with_custom_fee(i)
+                    for i in range(
+                        0,
+                        18,
+                    )
+                ],
+            ],
+            id="18_withdrawal_requests",
+        ),
+    ],
+)
 def test_extra_withdrawals(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
-    # requests_list: List[WithdrawalRequest],
+    requests_list: List[WithdrawalRequest],
 ):
     """Test how clients were to behave when more than 16 withdrawals would be allowed per block."""
     modified_code: bytes = b"3373fffffffffffffffffffffffffffffffffffffffe1460cb5760115f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff146101f457600182026001905f5b5f82111560685781019083028483029004916001019190604d565b909390049250505036603814608857366101f457346101f4575f5260205ff35b34106101f457600154600101600155600354806003026004013381556001015f35815560010160203590553360601b5f5260385f601437604c5fa0600101600355005b6003546002548082038060121160df575060125b5f5b8181146101835782810160030260040181604c02815460601b8152601401816001015481526020019060020154807fffffffffffffffffffffffffffffffff00000000000000000000000000000000168252906010019060401c908160381c81600701538160301c81600601538160281c81600501538160201c81600401538160181c81600301538160101c81600201538160081c81600101535360010160e1565b910180921461019557906002556101a0565b90505f6002555f6003555b5f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff14156101cd57505f5b6001546002828201116101e25750505f6101e8565b01600290035b5f555f600155604c025ff35b5f5ffd"  # noqa: E501
@@ -56,20 +92,6 @@ def test_extra_withdrawals(
         balance=0,
     )
 
-    # TODO: when i replace the following list with the parameterized version nothing works, why?
-    requests_list: List[WithdrawalRequest] = [
-        WithdrawalRequest(
-            validator_pubkey=0x01,
-            amount=0,
-            fee=Spec_EIP7002.get_fee(0),
-        ),
-        WithdrawalRequest(
-            validator_pubkey=0x01,
-            amount=0,
-            fee=Spec_EIP7002.get_fee(0),
-        ),
-    ]
-
     # given a list of withdrawal requests construct a withdrawal request transaction
     withdrawal_request_transaction = WithdrawalRequestTransaction(requests=requests_list)
     # prepare withdrawal senders
@@ -82,8 +104,7 @@ def test_extra_withdrawals(
         blocks=[
             Block(
                 txs=txs,
-                # TODO: why do i have to put the first element here to avoid an error? there is more than 1 request per block  # noqa: E501
-                requests_hash=Requests(requests_list[0]),
+                requests_hash=Requests(*requests_list),
             ),
         ],
         post={},