WIP: silence ported static tests; fix lint

Author: fselmo

tests/frontier/opcodes/test_blockhash.py

@@ -53,9 +53,7 @@ def test_genesis_hash_available(
     sender = pre.fund_eoa()
 
     intrinsic = fork.transaction_intrinsic_cost_calculator()
-    tx_gas_limit = (
-        intrinsic() + code.gas_cost(fork) + fork.sstore_state_gas()
-    )
+    tx_gas_limit = intrinsic() + code.gas_cost(fork) + fork.sstore_state_gas()
     blocks = (
         [
             Block(

tests/frontier/opcodes/test_dup.py

@@ -71,9 +71,7 @@ def test_dup(
         ty=0x0,
         to=account,
         gas_limit=(
-            intrinsic()
-            + account_code.gas_cost(fork)
-            + fork.sstore_state_gas()
+            intrinsic() + account_code.gas_cost(fork) + fork.sstore_state_gas()
         ),
         gas_price=10,
         protected=fork.supports_protected_txs(),

tests/osaka/eip7918_blob_reserve_price/test_blob_base_fee.py

@@ -59,9 +59,7 @@ def tx_gas(fork: Fork, destination_code: Bytecode) -> int:
     """
     intrinsic = fork.transaction_intrinsic_cost_calculator()
     return (
-        intrinsic()
-        + destination_code.gas_cost(fork)
-        + fork.sstore_state_gas()
+        intrinsic() + destination_code.gas_cost(fork) + fork.sstore_state_gas()
     )
 
 

tests/osaka/eip7939_count_leading_zeros/test_count_leading_zeros.py

@@ -258,9 +258,7 @@ def test_clz_stack_not_overflow(
     tx = Transaction(
         to=code_address,
         sender=pre.fund_eoa(),
-        gas_limit=(
-            intrinsic() + code_regular + code_state + eip_1706_slack
-        ),
+        gas_limit=(intrinsic() + code_regular + code_state + eip_1706_slack),
     )
 
     expected_gas_used = max(intrinsic() + code_regular, code_state)
@@ -447,9 +445,7 @@ def test_clz_jump_operation(
     # the EIP-7825 cap so the EIP-8037 reservoir holds the callee's state
     # work and parent's SSTORE state, plus EIP-1706 slack.
     gas_cap = fork.transaction_gas_limit_cap()
-    state_needed = (
-        caller_code.state_cost(fork) + callee_code.state_cost(fork)
-    )
+    state_needed = caller_code.state_cost(fork) + callee_code.state_cost(fork)
     if gas_cap is not None and state_needed > 0:
         gas_limit = gas_cap + state_needed + fork.sstore_state_gas()
     else:

tests/ported_static/amsterdam_skip_list.txt

@@ -217,9 +217,7 @@ def transactions(self, fork: Fork | None = None) -> List[Transaction]:
             # slot once per call. Fund the reservoir for `3*N + 2` SSTOREs
             # (one tail slot + one slack slot) so the entire state-set
             # work stays off `gas_left` under EIP-8037.
-            gas_limit += (
-                (len(self.requests) * 3 + 2) * fork.sstore_state_gas()
-            )
+            gas_limit += (len(self.requests) * 3 + 2) * fork.sstore_state_gas()
         return [
             Transaction(
                 gas_limit=gas_limit,

tests/ported_static/amsterdam_skip_list.txt.bak

@@ -108,18 +108,22 @@ def blocks(
         included_requests,
         fillvalue=[],
     ):
-        header_verify: Header | None = None
-        if fork.fork_at(
+        active_fork = fork.fork_at(
             block_number=len(blocks) + 1, timestamp=timestamp
-        ).header_requests_required():
+        )
+        header_verify: Header | None = None
+        if active_fork.header_requests_required():
             header_verify = Header(
                 requests_hash=Requests(*block_included_requests)
             )
         else:
             assert not block_included_requests
         blocks.append(
             Block(
-                txs=sum((r.transactions(fork) for r in block_requests), []),
+                txs=sum(
+                    (r.transactions(active_fork) for r in block_requests),
+                    [],
+                ),
                 header_verify=header_verify,
                 timestamp=timestamp,
             )

tests/prague/eip7002_el_triggerable_withdrawals/helpers.py

@@ -208,9 +208,7 @@ def transactions(self, fork: Fork | None = None) -> List[Transaction]:
             # tail/count slot once per call. Fund the reservoir for
             # `4*N + 2` SSTOREs (one tail slot + one slack slot) so the
             # entire state-set work stays off `gas_left` under EIP-8037.
-            gas_limit += (
-                (len(self.requests) * 4 + 2) * fork.sstore_state_gas()
-            )
+            gas_limit += (len(self.requests) * 4 + 2) * fork.sstore_state_gas()
         return [
             Transaction(
                 gas_limit=gas_limit,