Skip to content

Commit 44b47cc

Browse files
felix314159spencer-tb
authored andcommitted
fix: mypy
1 parent 650ec08 commit 44b47cc

39 files changed

Lines changed: 109 additions & 133 deletions

File tree

tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,14 +315,14 @@ def test_bal_callcode_nested_value_transfer(
315315
bob = pre.fund_eoa(amount=0)
316316

317317
call_gas = 0
318-
if fork.is_eip_enabled(eip_number=8037):
318+
if fork.is_eip_enabled(8037):
319319
call_gas = 500_000
320320
# TargetContract sends 100 wei to bob
321321
target_code = Op.CALL(call_gas, bob, 100, 0, 0, 0, 0)
322322
target_contract = pre.deploy_contract(code=target_code)
323323

324324
callcode_gas = 50_000
325-
if fork.is_eip_enabled(eip_number=8037):
325+
if fork.is_eip_enabled(8037):
326326
callcode_gas = 500_000
327327
# Oracle contract that uses CALLCODE to execute TargetContract's code
328328
oracle_code = Op.CALLCODE(callcode_gas, target_contract, 100, 0, 0, 0, 0)
@@ -711,7 +711,7 @@ def test_bal_2930_slot_listed_and_unlisted_writes(
711711

712712
intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
713713
gas_buffer = 50_000
714-
if fork.is_eip_enabled(eip_number=8037):
714+
if fork.is_eip_enabled(8037):
715715
gas_buffer = 500_000
716716
gas_limit = (
717717
intrinsic_gas_calculator(
@@ -2093,7 +2093,7 @@ def test_bal_create_transaction_empty_code(
20932093
contract_address = compute_create_address(address=alice, nonce=0)
20942094

20952095
gas_limit = 100_000
2096-
if fork.is_eip_enabled(eip_number=8037):
2096+
if fork.is_eip_enabled(8037):
20972097
gas_limit = 500_000
20982098

20992099
tx = Transaction(
@@ -2326,7 +2326,7 @@ def test_bal_all_transaction_types(
23262326
from tests.prague.eip7702_set_code_tx.spec import Spec as Spec7702
23272327

23282328
gas_limit = 100_000
2329-
if fork.is_eip_enabled(eip_number=8037):
2329+
if fork.is_eip_enabled(8037):
23302330
gas_limit = 500_000
23312331

23322332
# Create senders for each transaction type

tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip7002.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ def test_bal_7002_clean_sweep(
198198
)
199199

200200
gas_limit = 200_000
201-
if fork.is_eip_enabled(eip_number=8037):
201+
if fork.is_eip_enabled(8037):
202202
gas_limit = 500_000
203203

204204
# Transaction to system contract
@@ -301,7 +301,7 @@ def test_bal_7002_partial_sweep(
301301
senders = [pre.fund_eoa() for _ in range(num_requests)]
302302

303303
gas_limit = 200_000
304-
if fork.is_eip_enabled(eip_number=8037):
304+
if fork.is_eip_enabled(8037):
305305
gas_limit = 500_000
306306

307307
# Block 1: 20 withdrawal requests
@@ -482,7 +482,7 @@ def test_bal_7002_no_withdrawal_requests(
482482
value = 10
483483

484484
gas_limit = 200_000
485-
if fork.is_eip_enabled(eip_number=8037):
485+
if fork.is_eip_enabled(8037):
486486
gas_limit = 500_000
487487

488488
tx = Transaction(

tests/amsterdam/eip8037_state_creation_gas_cost_increase/test_state_gas_calldata_floor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def test_calldata_floor_exceeding_tx_gas_limit_cap(
165165
tx_base = gas_costs.GAS_TX_BASE
166166
max_tokens = (gas_limit_cap - tx_base) // floor_token
167167

168-
if fork.is_eip_enabled(eip_number=7976):
168+
if fork.is_eip_enabled(7976):
169169
# EIP-7976: all bytes contribute 4 floor tokens regardless of
170170
# value, so the token count is len(data) * 4.
171171
tokens_per_byte = 4

tests/byzantium/eip198_modexp_precompile/test_modexp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ def test_modexp(
503503
)
504504

505505
gas_limit = 500_000
506-
if fork.is_eip_enabled(eip_number=8037):
506+
if fork.is_eip_enabled(8037):
507507
gas_limit = 1_000_000
508508

509509
tx = Transaction(

tests/byzantium/eip214_staticcall/test_staticcall.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def test_staticcall_reentrant_call_to_precompile(
144144

145145
tx_value = 100
146146
gas_limit = 1_000_000
147-
if fork.is_eip_enabled(eip_number=8037):
147+
if fork.is_eip_enabled(8037):
148148
gas_limit = 2_000_000
149149

150150
tx = Transaction(

tests/cancun/create/test_create_oog_from_eoa_refunds.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,7 @@ def test_create_oog_from_eoa_refunds(
263263
"""
264264
helpers = deploy_helper_contracts(pre)
265265
extra_gas = (
266-
fork.is_eip_enabled(eip_number=8037)
267-
and oog_scenario == OogScenario.NO_OOG
266+
fork.is_eip_enabled(8037) and oog_scenario == OogScenario.NO_OOG
268267
)
269268
sender = pre.fund_eoa(amount=500_000_000 if extra_gas else 4_000_000)
270269
init_code = build_init_code(refund_type, oog_scenario, helpers)

tests/cancun/eip1153_tstore/test_tstorage_clear_after_tx.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def test_tstore_clear_after_deployment_tx(
4141
sender = pre.fund_eoa()
4242

4343
gas_limit = 100_000
44-
if fork.is_eip_enabled(eip_number=8037):
44+
if fork.is_eip_enabled(8037):
4545
gas_limit = 500_000
4646

4747
deployment_tx = Transaction(

tests/cancun/eip4844_blobs/test_blobhash_opcode.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ def test_blobhash_scenarios(
266266
sender = pre.fund_eoa()
267267

268268
gas_limit = 500_000
269-
if fork.is_eip_enabled(eip_number=8037):
269+
if fork.is_eip_enabled(8037):
270270
gas_limit = 5_000_000
271271

272272
blocks: List[Block] = []
@@ -335,7 +335,7 @@ def test_blobhash_invalid_blob_index(
335335
sender = pre.fund_eoa()
336336

337337
gas_limit = 500_000
338-
if fork.is_eip_enabled(eip_number=8037):
338+
if fork.is_eip_enabled(8037):
339339
gas_limit = 5_000_000
340340

341341
blocks: List[Block] = []
@@ -400,7 +400,7 @@ def test_blobhash_multiple_txs_in_block(
400400
sender = pre.fund_eoa()
401401

402402
gas_limit = 500_000
403-
if fork.is_eip_enabled(eip_number=8037):
403+
if fork.is_eip_enabled(8037):
404404
gas_limit = 5_000_000
405405

406406
def blob_tx(address: Address, tx_type: int) -> Transaction:

tests/cancun/eip4844_blobs/test_excess_blob_gas.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def tx_blob_data_cost(
107107

108108
@pytest.fixture
109109
def tx_gas_limit(fork: Fork) -> int: # noqa: D103
110-
if fork.is_eip_enabled(eip_number=8037):
110+
if fork.is_eip_enabled(8037):
111111
return 500_000
112112
return 45000
113113

tests/cancun/eip5656_mcopy/test_mcopy_contexts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def callee_address(pre: Alloc, callee_bytecode: Bytecode) -> Address: # noqa: D
141141
@pytest.fixture
142142
def tx(pre: Alloc, fork: Fork, caller_address: Address) -> Transaction: # noqa: D103
143143
gas_limit = 1_000_000
144-
if fork.is_eip_enabled(eip_number=8037):
144+
if fork.is_eip_enabled(8037):
145145
gas_limit = 5_000_000
146146
return Transaction(
147147
sender=pre.fund_eoa(),

0 commit comments

Comments
 (0)