post review: rename to json_fork and eels_fork

Author: gurukamath

tests/json_infra/__init__.py

@@ -82,9 +82,11 @@ def _build_eest_test_paths(base_path: str) -> tuple:
 )
 
 
-def _create_fork_config(package: str, bc_dirs: list, state_dirs: list) -> dict:
+def _create_fork_config(
+    eels_fork: str, bc_dirs: list, state_dirs: list
+) -> dict:
     return {
-        "package": package,
+        "eels_fork": eels_fork,
         "blockchain_test_dirs": bc_dirs,
         "state_test_dirs": state_dirs,
     }
@@ -112,8 +114,8 @@ def _create_fork_config(package: str, bc_dirs: list, state_dirs: list) -> dict:
 
 FORKS = {
     **{
-        fork: _create_fork_config(package, *PRE_CONSTANTINOPLE_DIRS)
-        for fork, package in [
+        json_fork: _create_fork_config(eels_fork, *PRE_CONSTANTINOPLE_DIRS)
+        for json_fork, eels_fork in [
             ("Frontier", "frontier"),
             ("Homestead", "homestead"),
             ("EIP150", "tangerine_whistle"),
@@ -123,8 +125,8 @@ def _create_fork_config(package: str, bc_dirs: list, state_dirs: list) -> dict:
         ]
     },
     **{
-        fork: _create_fork_config(package, *PRE_CANCUN_DIRS)
-        for fork, package in [
+        json_fork: _create_fork_config(eels_fork, *PRE_CANCUN_DIRS)
+        for json_fork, eels_fork in [
             ("Istanbul", "istanbul"),
             ("Berlin", "berlin"),
             ("London", "london"),
@@ -133,8 +135,8 @@ def _create_fork_config(package: str, bc_dirs: list, state_dirs: list) -> dict:
         ]
     },
     **{
-        fork: _create_fork_config(package, *CURRENT_DIRS)
-        for fork, package in [
+        json_fork: _create_fork_config(eels_fork, *CURRENT_DIRS)
+        for json_fork, eels_fork in [
             ("Cancun", "cancun"),
             ("Prague", "prague"),
         ]

tests/json_infra/helpers/exceptional_test_patterns.py

@@ -2,17 +2,17 @@
 
 
 def get_exceptional_blockchain_test_patterns(
-    network: str, package: str
+    json_fork: str, eels_fork: str
 ) -> Tuple[tuple[str, ...], tuple[str, ...], tuple[str, ...]]:
     """
-    Returns patterns for slow, ignored, and big-memory tests for a given network and package.
+    Returns patterns for slow, ignored, and big-memory tests for a given json_fork and eels_fork.
 
     Parameters
     ----------
-    network : str
-        The network name (e.g., "Frontier", "EIP150").
-    package : str
-        The package name (e.g., "frontier", "tangerine_whistle").
+    json_fork : str
+        The json_fork name (e.g., "Frontier", "EIP150").
+    eels_fork : str
+        The eels_fork name (e.g., "frontier", "tangerine_whistle").
 
     Returns
     -------
@@ -29,8 +29,8 @@ def get_exceptional_blockchain_test_patterns(
         "stTimeConsuming/static_Call50000_sha256.json",
         "vmPerformance/loopExp.json",
         "vmPerformance/loopMul.json",
-        f"QuadraticComplexitySolidity_CallDataCopy_d0g1v0_{network}",
-        f"CALLBlake2f_d9g0v0_{network}",
+        f"QuadraticComplexitySolidity_CallDataCopy_d0g1v0_{json_fork}",
+        f"CALLBlake2f_d9g0v0_{json_fork}",
         "CALLCODEBlake2f_d9g0v0",
         # GeneralStateTests
         "stRandom/randomStatetest177.json",
@@ -40,14 +40,14 @@ def get_exceptional_blockchain_test_patterns(
         # InvalidBlockTest
         "bcUncleHeaderValidity/nonceWrong.json",
         "bcUncleHeaderValidity/wrongMixHash.json",
-        f"tests/{package}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py\\:\\:test_valid\\[fork_{network}-blockchain_test-bls_pairing_non-degeneracy-\\]",
-        f"tests/{package}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py\\:\\:test_valid\\[fork_{network}-blockchain_test-bls_pairing_bilinearity-\\]",
-        f"tests/{package}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py\\:\\:test_valid\\[fork_{network}-blockchain_test-bls_pairing_e\\(G1,-G2\\)=e\\(-G1,G2\\)-\\]",
-        f"tests/{package}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py\\:\\:test_valid\\[fork_{network}-blockchain_test-bls_pairing_e\\(aG1,bG2\\)=e\\(abG1,G2\\)-\\]",
-        f"tests/{package}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py\\:\\:test_valid\\[fork_{network}-blockchain_test-bls_pairing_e\\(aG1,bG2\\)=e\\(G1,abG2\\)-\\]",
-        f"tests/{package}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py\\:\\:test_valid\\[fork_{network}-blockchain_test-inf_pair-\\]",
-        f"tests/{package}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py\\:\\:test_valid\\[fork_{network}-blockchain_test-multi_inf_pair-\\]",
-        f"tests/{package}/eip2935_historical_block_hashes_from_state/test_block_hashes\\.py\\:\\:test_block_hashes_history\\[fork_{network}-blockchain_test-full_history_plus_one_check_blockhash_first\\]",
+        f"tests/{eels_fork}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py\\:\\:test_valid\\[fork_{json_fork}-blockchain_test-bls_pairing_non-degeneracy-\\]",
+        f"tests/{eels_fork}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py\\:\\:test_valid\\[fork_{json_fork}-blockchain_test-bls_pairing_bilinearity-\\]",
+        f"tests/{eels_fork}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py\\:\\:test_valid\\[fork_{json_fork}-blockchain_test-bls_pairing_e\\(G1,-G2\\)=e\\(-G1,G2\\)-\\]",
+        f"tests/{eels_fork}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py\\:\\:test_valid\\[fork_{json_fork}-blockchain_test-bls_pairing_e\\(aG1,bG2\\)=e\\(abG1,G2\\)-\\]",
+        f"tests/{eels_fork}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py\\:\\:test_valid\\[fork_{json_fork}-blockchain_test-bls_pairing_e\\(aG1,bG2\\)=e\\(G1,abG2\\)-\\]",
+        f"tests/{eels_fork}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py\\:\\:test_valid\\[fork_{json_fork}-blockchain_test-inf_pair-\\]",
+        f"tests/{eels_fork}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py\\:\\:test_valid\\[fork_{json_fork}-blockchain_test-multi_inf_pair-\\]",
+        f"tests/{eels_fork}/eip2935_historical_block_hashes_from_state/test_block_hashes\\.py\\:\\:test_block_hashes_history\\[fork_{json_fork}-blockchain_test-full_history_plus_one_check_blockhash_first\\]",
     )
 
     # These are tests that are considered to be incorrect,
@@ -61,7 +61,7 @@ def get_exceptional_blockchain_test_patterns(
         # InvalidBlockTest
         "bcForgedTest",
         "bcMultiChainTest",
-        f"GasLimitHigherThan2p63m1_{network}",
+        f"GasLimitHigherThan2p63m1_{json_fork}",
     )
 
     # All tests that recursively create a large number of frames (50000)
@@ -81,7 +81,7 @@ def get_exceptional_blockchain_test_patterns(
 
 
 def get_exceptional_state_test_patterns(
-    network: str, package: str
+    json_fork: str, eels_fork: str
 ) -> tuple[str, ...]:
     slow_tests = (
         "CALLBlake2f_MaxRounds",
@@ -92,13 +92,13 @@ def get_exceptional_state_test_patterns(
         "GeneralStateTests/stTimeConsuming/CALLBlake2f_MaxRounds.json::CALLBlake2f_MaxRounds-fork_[Cancun-Prague]-d0g0v0",
         "GeneralStateTests/VMTests/vmPerformance/loopExp.json::loopExp-fork_[Cancun-Prague]-d[0-14]g0v0",
         "GeneralStateTests/VMTests/vmPerformance/loopMul.json::loopMul-fork_[Cancun-Prague]-d[0-2]g0v0",
-        f"tests/{package}/eip2537_bls_12_381_precompiles/test_bls12_pairing.py::test_valid[fork_{network}-state_test-bls_pairing_non-degeneracy-]",
-        f"tests/{package}/eip2537_bls_12_381_precompiles/test_bls12_pairing.py::test_valid[fork_{network}-state_test-bls_pairing_bilinearity-]",
-        f"tests/{package}/eip2537_bls_12_381_precompiles/test_bls12_pairing.py::test_valid[fork_{network}-state_test-bls_pairing_e(G1,-G2)=e(-G1,G2)-]",
-        f"tests/{package}/eip2537_bls_12_381_precompiles/test_bls12_pairing.py::test_valid[fork_{network}-state_test-bls_pairing_e(aG1,bG2)=e(abG1,G2)-]",
-        f"tests/{package}/eip2537_bls_12_381_precompiles/test_bls12_pairing.py::test_valid[fork_{network}-state_test-bls_pairing_e(aG1,bG2)=e(G1,abG2)-]",
-        f"tests/{package}/eip2537_bls_12_381_precompiles/test_bls12_pairing.py::test_valid[fork_{network}-state_test-inf_pair-]",
-        f"tests/{package}/eip2537_bls_12_381_precompiles/test_bls12_pairing.py::test_valid[fork_{network}-state_test-multi_inf_pair-]",
+        f"tests/{eels_fork}/eip2537_bls_12_381_precompiles/test_bls12_pairing.py::test_valid[fork_{json_fork}-state_test-bls_pairing_non-degeneracy-]",
+        f"tests/{eels_fork}/eip2537_bls_12_381_precompiles/test_bls12_pairing.py::test_valid[fork_{json_fork}-state_test-bls_pairing_bilinearity-]",
+        f"tests/{eels_fork}/eip2537_bls_12_381_precompiles/test_bls12_pairing.py::test_valid[fork_{json_fork}-state_test-bls_pairing_e(G1,-G2)=e(-G1,G2)-]",
+        f"tests/{eels_fork}/eip2537_bls_12_381_precompiles/test_bls12_pairing.py::test_valid[fork_{json_fork}-state_test-bls_pairing_e(aG1,bG2)=e(abG1,G2)-]",
+        f"tests/{eels_fork}/eip2537_bls_12_381_precompiles/test_bls12_pairing.py::test_valid[fork_{json_fork}-state_test-bls_pairing_e(aG1,bG2)=e(G1,abG2)-]",
+        f"tests/{eels_fork}/eip2537_bls_12_381_precompiles/test_bls12_pairing.py::test_valid[fork_{json_fork}-state_test-inf_pair-]",
+        f"tests/{eels_fork}/eip2537_bls_12_381_precompiles/test_bls12_pairing.py::test_valid[fork_{json_fork}-state_test-multi_inf_pair-]",
     )
 
     return slow_tests

tests/json_infra/helpers/load_blockchain_tests.py

@@ -131,7 +131,7 @@ def add_block_to_chain(
 
 
 # Functions that fetch individual test cases
-def load_json_fixture(test_file: str, network: str) -> Generator:
+def load_json_fixture(test_file: str, json_fork: str) -> Generator:
     # Extract the pure basename of the file without the path to the file.
     # Ex: Extract "world.json" from "path/to/file/world.json"
     # Extract the filename without the extension. Ex: Extract "world" from
@@ -145,7 +145,7 @@ def load_json_fixture(test_file: str, network: str) -> Generator:
             if "network" not in test:
                 continue
 
-            if test["network"] == network:
+            if test["network"] == json_fork:
                 found_keys.append(key)
 
         if not any(found_keys):
@@ -155,22 +155,22 @@ def load_json_fixture(test_file: str, network: str) -> Generator:
             yield {
                 "test_file": test_file,
                 "test_key": _key,
-                "network": network,
+                "json_fork": json_fork,
             }
 
 
 def fetch_blockchain_tests(
-    network: str,
+    json_fork: str,
 ) -> Generator[Dict | ParameterSet, None, None]:
     # Filter FORKS based on fork_option parameter
-    package = cast(str, FORKS[network]["package"])
-    test_dirs = cast(list[str], FORKS[network]["blockchain_test_dirs"])
+    eels_fork = cast(str, FORKS[json_fork]["eels_fork"])
+    test_dirs = cast(list[str], FORKS[json_fork]["blockchain_test_dirs"])
 
     (
         slow_list,
         ignore_list,
         big_memory_list,
-    ) = get_exceptional_blockchain_test_patterns(network, package)
+    ) = get_exceptional_blockchain_test_patterns(json_fork, eels_fork)
     all_slow = [re.compile(x) for x in slow_list]
     all_big_memory = [re.compile(x) for x in big_memory_list]
     all_ignore = [re.compile(x) for x in ignore_list]
@@ -192,7 +192,7 @@ def fetch_blockchain_tests(
     # Start yielding individual test cases from the file list
     for _test_file in files_to_iterate:
         try:
-            for _test_case in load_json_fixture(_test_file, network):
+            for _test_case in load_json_fixture(_test_file, json_fork):
                 # _identifier could identify files, folders through test_file
                 #  individual cases through test_key
                 _identifier = (
@@ -202,7 +202,7 @@ def fetch_blockchain_tests(
                     + _test_case["test_key"]
                     + ")"
                 )
-                _test_case["package"] = package
+                _test_case["eels_fork"] = eels_fork
                 if any(x.search(_identifier) for x in all_ignore):
                     continue
                 elif any(x.search(_identifier) for x in all_slow):

tests/json_infra/helpers/load_state_tests.py

@@ -19,15 +19,15 @@
 parser = create_parser()
 
 
-def fetch_state_tests(network: str) -> Generator:
+def fetch_state_tests(json_fork: str) -> Generator:
     """
     Fetches all the general state tests from the given directory
     """
     # Filter FORKS based on fork_option parameter
-    package = cast(str, FORKS[network]["package"])
-    test_dirs = cast(list[str], FORKS[network]["state_test_dirs"])
+    eels_fork = cast(str, FORKS[json_fork]["eels_fork"])
+    test_dirs = cast(list[str], FORKS[json_fork]["state_test_dirs"])
 
-    slow_tests = get_exceptional_state_test_patterns(network, package)
+    slow_tests = get_exceptional_state_test_patterns(json_fork, eels_fork)
 
     # Get all the files to iterate over from both eest_tests_path and ethereum_tests_path
     all_jsons = []
@@ -40,14 +40,14 @@ def fetch_state_tests(network: str) -> Generator:
         test_cases = read_test_cases(test_file_path)
 
         for test_case in test_cases:
-            if test_case.fork_name != network:
+            if test_case.fork_name != json_fork:
                 continue
 
             test_case_dict = {
                 "test_file": test_case.path,
                 "test_key": test_case.key,
                 "index": test_case.index,
-                "network": network,
+                "json_fork": json_fork,
             }
 
             if test_case.key in slow_tests:
@@ -75,7 +75,7 @@ def run_state_test(test_case: Dict[str, str]) -> None:
     test_file = test_case["test_file"]
     test_key = test_case["test_key"]
     index = test_case["index"]
-    network = test_case["network"]
+    json_fork = test_case["json_fork"]
     with open(test_file) as f:
         tests = json.load(f)
 
@@ -88,7 +88,7 @@ def run_state_test(test_case: Dict[str, str]) -> None:
 
     alloc = tests[test_key]["pre"]
 
-    post = tests[test_key]["post"][network][index]
+    post = tests[test_key]["post"][json_fork][index]
     post_hash = post["hash"]
     d = post["indexes"]["data"]
     g = post["indexes"]["gas"]
@@ -130,7 +130,7 @@ def run_state_test(test_case: Dict[str, str]) -> None:
         "--input.txs",
         "stdin",
         "--state.fork",
-        f"{network}",
+        f"{json_fork}",
         "--state-test",
     ]
     t8n_options = parser.parse_args(t8n_args)

tests/json_infra/test_blockchain_tests.py

@@ -21,7 +21,8 @@ def _generate_test_function(fork_name: str) -> Callable:
     )
     def test_func(blockchain_test_case: Dict) -> None:
         load = Load(
-            blockchain_test_case["network"], blockchain_test_case["package"]
+            blockchain_test_case["json_fork"],
+            blockchain_test_case["eels_fork"],
         )
         run_blockchain_st_test(blockchain_test_case, load=load)