Skip to content

chore(tests): drop non-load-bearing hardcoded gas limits from ported static tests #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
spencer-tb wants to merge 1 commit into
base: ported-static-fork-reorg
Choose a base branch
from
Draft

chore(tests): drop non-load-bearing hardcoded gas limits from ported static tests #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions tests/ported_static/byzantium/stPreCompiledContracts/test_modexp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,6 @@ def test_modexp(
timestamp=1000,
prev_randao=0x20000,
base_fee_per_gas=10,
gas_limit=10000000000,
)

pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
Expand Down Expand Up @@ -1291,13 +1290,11 @@ def test_modexp(
"0000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010001" # noqa: E501
),
]
tx_gas = [100000000, 90000, 110000, 200000]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
error=_exc,
)

Expand Down
3 changes: 0 additions & 3 deletions tests/ported_static/byzantium/stPreCompiledContracts/test_modexp_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,6 @@ def test_modexp_tests(
timestamp=1000,
prev_randao=0x20000,
base_fee_per_gas=10,
gas_limit=100000000,
)

# Source: yul
Expand Down Expand Up @@ -1219,13 +1218,11 @@ def test_modexp_tests(
Bytes("048071d3") + Hash(0x9C00) + Hash(0x1) + Hash(0xD7A1),
Bytes("048071d3") + Hash(0xD796) + Hash(0xD796) + Hash(0xA7D5),
]
tx_gas = [16777216]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
nonce=1,
error=_exc,
)
Expand Down
2 changes: 0 additions & 2 deletions tests/ported_static/byzantium/stReturnDataTest/test_modexp_modsize0_returndatasize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,11 @@ def test_modexp_modsize0_returndatasize(
"0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000f3f14010101" # noqa: E501
),
]
tx_gas = [10000000]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
error=_exc,
)

Expand Down
2 changes: 0 additions & 2 deletions tests/ported_static/byzantium/stReturnDataTest/test_too_long_return_data_copy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,13 +464,11 @@ def test_too_long_return_data_copy(
+ Hash(0x10)
+ Hash(addr_2, left_padding=True),
]
tx_gas = [16777216]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
nonce=1,
gas_price=100,
error=_exc,
Expand Down
3 changes: 0 additions & 3 deletions tests/ported_static/byzantium/stRevertTest/test_revert_opcode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ def test_revert_opcode(
timestamp=1000,
prev_randao=0x20000,
base_fee_per_gas=10,
gas_limit=10000000,
)

# Source: raw
Expand Down Expand Up @@ -113,14 +112,12 @@ def test_revert_opcode(
tx_data = [
Bytes(""),
]
tx_gas = [800000, 30000]
tx_value = [0, 10]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
value=tx_value[v],
error=_exc,
)
Expand Down
6 changes: 0 additions & 6 deletions tests/ported_static/byzantium/stRevertTest/test_revert_opcode_return.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ def test_revert_opcode_return(
timestamp=1000,
prev_randao=0x20000,
base_fee_per_gas=10,
gas_limit=10000000,
)

pre[sender] = Account(balance=0xE8D4A51000)
Expand Down Expand Up @@ -250,15 +249,10 @@ def test_revert_opcode_return(
Hash(addr_5, left_padding=True),
Hash(addr_6, left_padding=True),
]
tx_gas = [800000, 80000]
if fork.is_eip_enabled(8037):
tx_gas = [800000, 250_000]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
error=_exc,
)

Expand Down
1 change: 0 additions & 1 deletion tests/ported_static/byzantium/stRevertTest/test_revert_precompiled_touch_exact_oog_paris.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,6 @@ def test_revert_precompiled_touch_exact_oog_paris(
timestamp=1000,
prev_randao=0x20000,
base_fee_per_gas=10,
gas_limit=4012015,
)

pre[addr_5] = Account(balance=1)
Expand Down
3 changes: 0 additions & 3 deletions tests/ported_static/byzantium/stStaticCall/test_static_ab_acalls0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ def test_static_ab_acalls0(
timestamp=1000,
prev_randao=0x20000,
base_fee_per_gas=10,
gas_limit=10000000,
)

# Source: lll
Expand Down Expand Up @@ -193,14 +192,12 @@ def test_static_ab_acalls0(
Hash(addr, left_padding=True),
Hash(addr_3, left_padding=True),
]
tx_gas = [1000000]
tx_value = [100000]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
value=tx_value[v],
error=_exc,
)
Expand Down
3 changes: 0 additions & 3 deletions tests/ported_static/byzantium/stStaticCall/test_static_ab_acalls_suicide0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ def test_static_ab_acalls_suicide0(
timestamp=1000,
prev_randao=0x20000,
base_fee_per_gas=10,
gas_limit=100000000,
)

# Source: lll
Expand Down Expand Up @@ -199,14 +198,12 @@ def test_static_ab_acalls_suicide0(
Hash(addr, left_padding=True),
Hash(addr_3, left_padding=True),
]
tx_gas = [10000000]
tx_value = [100000]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
value=tx_value[v],
error=_exc,
)
Expand Down
1 change: 0 additions & 1 deletion tests/ported_static/byzantium/stStaticCall/test_static_call10.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ def test_static_call10(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
value=tx_value[v],
error=_exc,
)
Expand Down
3 changes: 0 additions & 3 deletions tests/ported_static/byzantium/stStaticCall/test_static_call1024_balance_too_low.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ def test_static_call1024_balance_too_low(
timestamp=1000,
prev_randao=0x20000,
base_fee_per_gas=10,
gas_limit=9223372036854775807,
)

addr = pre.fund_eoa(amount=7000) # noqa: F841
Expand Down Expand Up @@ -157,14 +156,12 @@ def test_static_call1024_balance_too_low(
Hash(addr_2, left_padding=True),
Hash(addr_3, left_padding=True),
]
tx_gas = [17592186099592]
tx_value = [10]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
value=tx_value[v],
error=_exc,
)
Expand Down
3 changes: 0 additions & 3 deletions tests/ported_static/byzantium/stStaticCall/test_static_call1024_balance_too_low2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ def test_static_call1024_balance_too_low2(
timestamp=1000,
prev_randao=0x20000,
base_fee_per_gas=10,
gas_limit=9223372036854775807,
)

addr = pre.fund_eoa(amount=7000) # noqa: F841
Expand Down Expand Up @@ -157,14 +156,12 @@ def test_static_call1024_balance_too_low2(
Hash(addr_2, left_padding=True),
Hash(addr_3, left_padding=True),
]
tx_gas = [17592186099592]
tx_value = [10]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
value=tx_value[v],
error=_exc,
)
Expand Down
3 changes: 0 additions & 3 deletions tests/ported_static/byzantium/stStaticCall/test_static_call1024_pre_calls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ def test_static_call1024_pre_calls(
timestamp=1000,
prev_randao=0x20000,
base_fee_per_gas=10,
gas_limit=9223372036854775807,
)

addr = pre.fund_eoa(amount=7000) # noqa: F841
Expand Down Expand Up @@ -187,14 +186,12 @@ def test_static_call1024_pre_calls(
Hash(addr_2, left_padding=True),
Hash(addr_3, left_padding=True),
]
tx_gas = [9214364837600034817]
tx_value = [10]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
value=tx_value[v],
error=_exc,
)
Expand Down
3 changes: 0 additions & 3 deletions tests/ported_static/byzantium/stStaticCall/test_static_call1024_pre_calls3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ def test_static_call1024_pre_calls3(
timestamp=1000,
prev_randao=0x20000,
base_fee_per_gas=10,
gas_limit=9223372036854775807,
)

addr = pre.fund_eoa(amount=7000) # noqa: F841
Expand Down Expand Up @@ -187,14 +186,12 @@ def test_static_call1024_pre_calls3(
Hash(addr_2, left_padding=True),
Hash(addr_3, left_padding=True),
]
tx_gas = [9214364837600034817]
tx_value = [10]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
value=tx_value[v],
error=_exc,
)
Expand Down
3 changes: 0 additions & 3 deletions tests/ported_static/byzantium/stStaticCall/test_static_call50000_ecrec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ def test_static_call50000_ecrec(
timestamp=1000,
prev_randao=0x20000,
base_fee_per_gas=10,
gas_limit=95000000,
)

# Source: lll
Expand Down Expand Up @@ -172,14 +171,12 @@ def test_static_call50000_ecrec(
Hash(addr, left_padding=True),
Hash(addr_2, left_padding=True),
]
tx_gas = [94500000]
tx_value = [10]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
value=tx_value[v],
error=_exc,
)
Expand Down
3 changes: 0 additions & 3 deletions tests/ported_static/byzantium/stStaticCall/test_static_call50000_identity2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ def test_static_call50000_identity2(
timestamp=1000,
prev_randao=0x20000,
base_fee_per_gas=10,
gas_limit=8925000000,
)

# Source: lll
Expand Down Expand Up @@ -176,14 +175,12 @@ def test_static_call50000_identity2(
Hash(addr, left_padding=True),
Hash(addr_2, left_padding=True),
]
tx_gas = [882500000]
tx_value = [10]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
value=tx_value[v],
error=_exc,
)
Expand Down
3 changes: 0 additions & 3 deletions tests/ported_static/byzantium/stStaticCall/test_static_call50000bytes_contract50_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ def test_static_call50000bytes_contract50_1(
timestamp=1000,
prev_randao=0x20000,
base_fee_per_gas=10,
gas_limit=892500000000,
)

# Source: lll
Expand Down Expand Up @@ -198,14 +197,12 @@ def test_static_call50000bytes_contract50_1(
Hash(addr_2, left_padding=True),
Hash(addr_4, left_padding=True),
]
tx_gas = [882500000000]
tx_value = [10]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
value=tx_value[v],
error=_exc,
)
Expand Down
3 changes: 0 additions & 3 deletions tests/ported_static/byzantium/stStaticCall/test_static_call50000bytes_contract50_2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ def test_static_call50000bytes_contract50_2(
timestamp=1000,
prev_randao=0x20000,
base_fee_per_gas=10,
gas_limit=892500000000,
)

# Source: lll
Expand Down Expand Up @@ -198,14 +197,12 @@ def test_static_call50000bytes_contract50_2(
Hash(addr_2, left_padding=True),
Hash(addr_4, left_padding=True),
]
tx_gas = [882500000000]
tx_value = [10]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
value=tx_value[v],
error=_exc,
)
Expand Down
3 changes: 0 additions & 3 deletions tests/ported_static/byzantium/stStaticCall/test_static_call50000bytes_contract50_3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ def test_static_call50000bytes_contract50_3(
timestamp=1000,
prev_randao=0x20000,
base_fee_per_gas=10,
gas_limit=892500000000,
)

# Source: lll
Expand Down Expand Up @@ -198,14 +197,12 @@ def test_static_call50000bytes_contract50_3(
Hash(addr_2, left_padding=True),
Hash(addr_4, left_padding=True),
]
tx_gas = [882500000000]
tx_value = [10]

tx = Transaction(
sender=sender,
to=target,
data=tx_data[d],
gas_limit=tx_gas[g],
value=tx_value[v],
error=_exc,
)
Expand Down
Loading
Loading