Skip to content

Commit 665a261

Browse files
refactor(tests): simplify push opcode parameterization
1 parent 09dd3aa commit 665a261

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

tests/zkevm/test_worst_compute.py

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1711,39 +1711,39 @@ def test_worst_calldataload(
17111711
@pytest.mark.parametrize(
17121712
"opcode",
17131713
[
1714-
pytest.param(Op.PUSH0, id="PUSH0"),
1715-
pytest.param(Op.PUSH1, id="PUSH1"),
1716-
pytest.param(Op.PUSH2, id="PUSH2"),
1717-
pytest.param(Op.PUSH3, id="PUSH3"),
1718-
pytest.param(Op.PUSH4, id="PUSH4"),
1719-
pytest.param(Op.PUSH5, id="PUSH5"),
1720-
pytest.param(Op.PUSH6, id="PUSH6"),
1721-
pytest.param(Op.PUSH7, id="PUSH7"),
1722-
pytest.param(Op.PUSH8, id="PUSH8"),
1723-
pytest.param(Op.PUSH9, id="PUSH9"),
1724-
pytest.param(Op.PUSH10, id="PUSH10"),
1725-
pytest.param(Op.PUSH11, id="PUSH11"),
1726-
pytest.param(Op.PUSH12, id="PUSH12"),
1727-
pytest.param(Op.PUSH13, id="PUSH13"),
1728-
pytest.param(Op.PUSH14, id="PUSH14"),
1729-
pytest.param(Op.PUSH15, id="PUSH15"),
1730-
pytest.param(Op.PUSH16, id="PUSH16"),
1731-
pytest.param(Op.PUSH17, id="PUSH17"),
1732-
pytest.param(Op.PUSH18, id="PUSH18"),
1733-
pytest.param(Op.PUSH19, id="PUSH19"),
1734-
pytest.param(Op.PUSH20, id="PUSH20"),
1735-
pytest.param(Op.PUSH21, id="PUSH21"),
1736-
pytest.param(Op.PUSH22, id="PUSH22"),
1737-
pytest.param(Op.PUSH23, id="PUSH23"),
1738-
pytest.param(Op.PUSH24, id="PUSH24"),
1739-
pytest.param(Op.PUSH25, id="PUSH25"),
1740-
pytest.param(Op.PUSH26, id="PUSH26"),
1741-
pytest.param(Op.PUSH27, id="PUSH27"),
1742-
pytest.param(Op.PUSH28, id="PUSH28"),
1743-
pytest.param(Op.PUSH29, id="PUSH29"),
1744-
pytest.param(Op.PUSH30, id="PUSH30"),
1745-
pytest.param(Op.PUSH31, id="PUSH31"),
1746-
pytest.param(Op.PUSH32, id="PUSH32"),
1714+
pytest.param(Op.PUSH0),
1715+
pytest.param(Op.PUSH1),
1716+
pytest.param(Op.PUSH2),
1717+
pytest.param(Op.PUSH3),
1718+
pytest.param(Op.PUSH4),
1719+
pytest.param(Op.PUSH5),
1720+
pytest.param(Op.PUSH6),
1721+
pytest.param(Op.PUSH7),
1722+
pytest.param(Op.PUSH8),
1723+
pytest.param(Op.PUSH9),
1724+
pytest.param(Op.PUSH10),
1725+
pytest.param(Op.PUSH11),
1726+
pytest.param(Op.PUSH12),
1727+
pytest.param(Op.PUSH13),
1728+
pytest.param(Op.PUSH14),
1729+
pytest.param(Op.PUSH15),
1730+
pytest.param(Op.PUSH16),
1731+
pytest.param(Op.PUSH17),
1732+
pytest.param(Op.PUSH18),
1733+
pytest.param(Op.PUSH19),
1734+
pytest.param(Op.PUSH20),
1735+
pytest.param(Op.PUSH21),
1736+
pytest.param(Op.PUSH22),
1737+
pytest.param(Op.PUSH23),
1738+
pytest.param(Op.PUSH24),
1739+
pytest.param(Op.PUSH25),
1740+
pytest.param(Op.PUSH26),
1741+
pytest.param(Op.PUSH27),
1742+
pytest.param(Op.PUSH28),
1743+
pytest.param(Op.PUSH29),
1744+
pytest.param(Op.PUSH30),
1745+
pytest.param(Op.PUSH31),
1746+
pytest.param(Op.PUSH32),
17471747
],
17481748
)
17491749
def test_worst_push(
@@ -1755,7 +1755,7 @@ def test_worst_push(
17551755
"""Test running a block with as many PUSH as possible."""
17561756
env = Environment()
17571757

1758-
op = Op.PUSH0 if Op.PUSH0 == opcode else opcode(1)
1758+
op = opcode[1] if opcode.has_data_portion() else opcode
17591759
opcode_sequence = op * MAX_STACK_HEIGHT
17601760
target_contract_address = pre.deploy_contract(code=opcode_sequence)
17611761

0 commit comments

Comments
 (0)