chore(tooling): enforce ruff rule c420 (#2146)

* enforce c420

* enforce ruff rule c420

* Update tests/prague/eip7702_set_code_tx/test_gas.py

Co-authored-by: danceratopz <[email protected]>

* Update tests/cancun/eip1153_tstore/test_tstorage.py

Co-authored-by: danceratopz <[email protected]>

* Update tests/cancun/eip1153_tstore/test_tstorage.py

Co-authored-by: danceratopz <[email protected]>

* Update tests/cancun/eip1153_tstore/test_tstorage.py

Co-authored-by: danceratopz <[email protected]>

---------

Co-authored-by: danceratopz <[email protected]>

Author: felix314159

pyproject.toml

@@ -129,7 +129,7 @@ line-length = 99
 [tool.ruff.lint]
 select = ["E", "F", "B", "W", "I", "A", "N", "D", "C"]
 fixable = ["I", "B", "E", "F", "W", "D", "C"]
-ignore = ["D205", "D203", "D212", "D415", "C901", "A005", "C420"]
+ignore = ["D205", "D203", "D212", "D415", "C901", "A005"]
 
 [tool.mypy]
 disable_error_code = ["import-untyped"]

tests/cancun/eip1153_tstore/test_tstorage.py

@@ -45,7 +45,7 @@ def test_transient_storage_unset_values(state_test: StateTestFiller, pre: Alloc)
 
     code_address = pre.deploy_contract(
         code=code,  # type: ignore
-        storage={slot: 1 for slot in slots_under_test},
+        storage=dict.fromkeys(slots_under_test, 1),
     )
 
     tx = Transaction(
@@ -54,7 +54,7 @@ def test_transient_storage_unset_values(state_test: StateTestFiller, pre: Alloc)
         gas_limit=1_000_000,
     )
 
-    post = {code_address: Account(storage={slot: 0 for slot in slots_under_test})}
+    post = {code_address: Account(storage=dict.fromkeys(slots_under_test, 0))}
 
     state_test(
         env=env,
@@ -79,7 +79,7 @@ def test_tload_after_tstore(state_test: StateTestFiller, pre: Alloc):
     )
     code_address = pre.deploy_contract(
         code=code,  # type: ignore
-        storage={slot: 0xFF for slot in slots_under_test},
+        storage=dict.fromkeys(slots_under_test, 0xFF),
     )
 
     tx = Transaction(
@@ -114,7 +114,7 @@ def test_tload_after_sstore(state_test: StateTestFiller, pre: Alloc):
     )
     code_address = pre.deploy_contract(
         code=code,  # type: ignore
-        storage={slot: 1 for slot in slots_under_test},
+        storage=dict.fromkeys(slots_under_test, 1),
     )
 
     tx = Transaction(
@@ -127,7 +127,7 @@ def test_tload_after_sstore(state_test: StateTestFiller, pre: Alloc):
         code_address: Account(
             code=code,
             storage={slot - 1: 0xFF for slot in slots_under_test}
-            | {slot: 0 for slot in slots_under_test},
+            | dict.fromkeys(slots_under_test, 0),
         )
     }
 
@@ -157,7 +157,7 @@ def test_tload_after_tstore_is_zero(state_test: StateTestFiller, pre: Alloc):
 
     code_address = pre.deploy_contract(
         code=code,  # type: ignore
-        storage={slot: 0xFFFF for slot in slots_to_write + slots_to_read},
+        storage=dict.fromkeys(slots_to_write + slots_to_read, 0xFFFF),
     )
 
     tx = Transaction(
@@ -168,7 +168,7 @@ def test_tload_after_tstore_is_zero(state_test: StateTestFiller, pre: Alloc):
 
     post = {
         code_address: Account(
-            storage={slot: 0 for slot in slots_to_read} | {slot: 0xFFFF for slot in slots_to_write}
+            storage=dict.fromkeys(slots_to_read, 0) | dict.fromkeys(slots_to_write, 0xFFFF)
         )
     }
 

tests/cancun/eip4788_beacon_root/spec.py

@@ -58,7 +58,7 @@ def expected_storage(
         - validity of the timestamp input used within the call.
         """
         # By default assume the call is unsuccessful and all keys are zero
-        storage = Storage({k: 0 for k in range(4)})  # type: ignore
+        storage = Storage(dict.fromkeys(range(4), 0))  # type: ignore
         if valid_call and valid_input:
             # beacon root contract call is successful
             storage[0] = 1

tests/cancun/eip4844_blobs/test_blobhash_opcode.py

@@ -387,7 +387,7 @@ def blob_tx(address: Address, tx_type: int):
             storage={i: random_blob_hashes[i] for i in range(max_blobs_per_tx)}
         )
         if address in (addresses[1], addresses[3])
-        else Account(storage={i: 0 for i in range(max_blobs_per_tx)})
+        else Account(storage=dict.fromkeys(range(max_blobs_per_tx), 0))
         for address in addresses
     }
     blockchain_test(

tests/cancun/eip4844_blobs/test_point_evaluation_precompile.py

@@ -700,7 +700,7 @@ def test_precompile_during_fork(
 
     post = {
         precompile_caller_address: Account(
-            storage={b: 1 for b in range(1, len(PRE_FORK_BLOCK_RANGE) + 1)},
+            storage=dict.fromkeys(range(1, len(PRE_FORK_BLOCK_RANGE) + 1), 1),
             # Only the call in the last block's tx fails; storage 0 by default.
         ),
         Address(Spec.POINT_EVALUATION_PRECOMPILE_ADDRESS): Account(

tests/prague/eip7702_set_code_tx/test_gas.py

@@ -959,7 +959,7 @@ def test_account_warming(
     callee_code += Op.STOP
     callee_address = pre.deploy_contract(
         callee_code,
-        storage={check_address: 0xDEADBEEF for check_address in addresses_to_check},
+        storage=dict.fromkeys(addresses_to_check, 0xDEADBEEF),
     )
 
     tx = Transaction(

tests/prague/eip7702_set_code_tx/test_set_code_txs.py

@@ -128,7 +128,7 @@ def test_self_sponsored_set_code(
         pre=pre,
         tx=tx,
         post={
-            set_code_to_address: Account(storage={k: 0 for k in storage}),
+            set_code_to_address: Account(storage=dict.fromkeys(storage, 0)),
             sender: Account(
                 nonce=2,
                 code=Spec.delegation_designation(set_code_to_address),
@@ -208,7 +208,7 @@ def test_set_code_to_sstore(
         tx=tx,
         post={
             set_code_to_address: Account(
-                storage={k: 0 for k in storage},
+                storage=dict.fromkeys(storage, 0),
             ),
             auth_signer: Account(
                 nonce=2 if self_sponsored else 1,
@@ -799,8 +799,8 @@ def test_set_code_call_set_code(
         pre=pre,
         tx=tx,
         post={
-            set_code_to_address_1: Account(storage={k: 0 for k in storage_1}),
-            set_code_to_address_2: Account(storage={k: 0 for k in storage_2}),
+            set_code_to_address_1: Account(storage=dict.fromkeys(storage_1, 0)),
+            set_code_to_address_2: Account(storage=dict.fromkeys(storage_2, 0)),
             auth_signer_1: Account(
                 nonce=1,
                 code=Spec.delegation_designation(set_code_to_address_1),

tests/prague/eip7702_set_code_tx/test_set_code_txs_2.py

@@ -1745,7 +1745,7 @@ def test_set_code_type_tx_pre_fork(
         pre=pre,
         tx=tx,
         post={
-            set_code_to_address: Account(storage={k: 0 for k in storage}),
+            set_code_to_address: Account(storage=dict.fromkeys(storage, 0)),
             sender: Account(
                 nonce=0,
                 code="",

tests/unscheduled/eip7692_eof_v1/eip3540_eof_v1/test_execution_function.py

@@ -419,7 +419,7 @@ def test_eof_functions_contract_call_within_deep_nested(
         sender=sender,
     )
     post = {
-        callee_address: Account(storage={i: 1 for i in range(MAX_CODE_SECTIONS)}),
+        callee_address: Account(storage=dict.fromkeys(range(MAX_CODE_SECTIONS), 1)),
         nested_callee_address: Account(
             storage={
                 0: 1,