update tests

Author: gurukamath

tests/helpers/__init__.py

@@ -21,3 +21,7 @@
         "fixture_path": "tests/fixtures/latest_fork_tests",
     },
 }
+
+
+ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"]
+EEST_TESTS_PATH = TEST_FIXTURES["latest_fork_tests"]["fixture_path"]

tests/osaka/test_eof.py

@@ -9,11 +9,12 @@
 from ethereum.osaka.vm.eof.validation import validate_eof_container
 from ethereum.osaka.vm.exceptions import InvalidEof
 from ethereum.utils.hexadecimal import hex_to_bytes
+from tests.helpers import EEST_TESTS_PATH
 
 TEST_DIRS = (
-    "tests/fixtures/latest_fork_tests/osaka/eof/eof_tests/eip7692_eof_v1",
+    f"{EEST_TESTS_PATH}/osaka/eof/eof_tests/eip7692_eof_v1",
     "tests/fixtures/ethereum_tests/EOFTests/",
-    "tests/fixtures/latest_fork_tests/osaka/eof/evmone_tests/eof_tests",
+    f"{EEST_TESTS_PATH}/osaka/eof/evmone_tests/eof_tests",
 )
 
 

tests/osaka/test_evm_tools.py

@@ -1,23 +1,20 @@
 from functools import partial
-from typing import Dict, Generator, Tuple
+from typing import Dict
 
 import pytest
 
-from tests.helpers import TEST_FIXTURES
+from tests.helpers import EEST_TESTS_PATH
 from tests.helpers.load_evm_tools_tests import (
     fetch_evm_tools_tests,
     idfn,
     load_evm_tools_test,
 )
 
-ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"]
-TEST_DIR = f"{ETHEREUM_TESTS_PATH}/GeneralStateTests/"
+EEST_STATE_TESTS_DIR = (
+    f"{EEST_TESTS_PATH}/osaka/eof/state_tests/eip7692_eof_v1/"
+)
 FORK_NAME = "Osaka"
 
-run_evm_tools_test = partial(
-    load_evm_tools_test,
-    fork_name=FORK_NAME,
-)
 
 SLOW_TESTS = (
     "CALLBlake2f_MaxRounds",
@@ -34,25 +31,26 @@
     "tests/osaka/eip2537_bls_12_381_precompiles/test_bls12_pairing.py::test_valid[fork_Osaka-state_test-multi_inf_pair-]",
 )
 
-test_dirs = (
-    "tests/fixtures/latest_fork_tests/osaka/eof/state_tests/eip7692_eof_v1",
-)
 
+# Define tests
+fetch_tests = partial(
+    fetch_evm_tools_tests,
+    fork_name=FORK_NAME,
+    slow_tests=SLOW_TESTS,
+)
 
-def fetch_temporary_tests(test_dirs: Tuple[str, ...]) -> Generator:
-    for test_dir in test_dirs:
-        yield from fetch_evm_tools_tests(
-            test_dir,
-            FORK_NAME,
-            SLOW_TESTS,
-        )
+run_tests = partial(
+    load_evm_tools_test,
+    fork_name=FORK_NAME,
+)
 
 
+# Run EEST test fixtures
 @pytest.mark.evm_tools
 @pytest.mark.parametrize(
     "test_case",
-    fetch_temporary_tests(test_dirs),
+    fetch_tests(EEST_STATE_TESTS_DIR),
     ids=idfn,
 )
-def test_evm_tools(test_case: Dict) -> None:
-    run_evm_tools_test(test_case)
+def test_eest_evm_tools(test_case: Dict) -> None:
+    run_tests(test_case)

tests/osaka/test_state_transition.py

@@ -1,32 +1,21 @@
 from functools import partial
-from typing import Dict, Generator, Tuple
+from typing import Dict
 
 import pytest
 
-from tests.helpers import TEST_FIXTURES
+from tests.helpers import EEST_TESTS_PATH
 from tests.helpers.load_state_tests import (
     Load,
     fetch_state_test_files,
     idfn,
     run_blockchain_st_test,
 )
 
-fetch_osaka_tests = partial(fetch_state_test_files, network="Osaka")
-
-FIXTURES_LOADER = Load("Osaka", "osaka")
-
-run_osaka_blockchain_st_tests = partial(
-    run_blockchain_st_test, load=FIXTURES_LOADER
+EEST_BLOCKCHAIN_TESTS_DIR = (
+    f"{EEST_TESTS_PATH}/osaka/eof/blockchain_tests/eip7692_eof_v1/"
 )
-
-ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"]
-ETHEREUM_SPEC_TESTS_PATH = TEST_FIXTURES["execution_spec_tests"][
-    "fixture_path"
-]
-
-
-# Run state tests
-test_dir = f"{ETHEREUM_TESTS_PATH}/BlockchainTests/"
+NETWORK = "Osaka"
+PACKAGE = "osaka"
 
 SLOW_TESTS = (
     # GeneralStateTests
@@ -82,33 +71,25 @@
     "stStaticCall/",
 )
 
-fetch_state_tests = partial(
-    fetch_osaka_tests,
+# Define Tests
+fetch_tests = partial(
+    fetch_state_test_files,
+    network=NETWORK,
     ignore_list=IGNORE_TESTS,
     slow_list=SLOW_TESTS,
     big_memory_list=BIG_MEMORY_TESTS,
 )
 
+FIXTURES_LOADER = Load(NETWORK, PACKAGE)
 
-# Run temporary test fixtures for Osaka
-test_dirs = (
-    "tests/fixtures/latest_fork_tests/osaka/eof/blockchain_tests/eip7692_eof_v1",
-)
-
-
-def fetch_temporary_tests(test_dirs: Tuple[str, ...]) -> Generator:
-    """
-    Fetch the relevant tests for a particular EIP-Implementation
-    from among the temporary fixtures from ethereum-spec-tests.
-    """
-    for test_dir in test_dirs:
-        yield from fetch_state_tests(test_dir)
+run_tests = partial(run_blockchain_st_test, load=FIXTURES_LOADER)
 
 
+# Run EEST test fixtures
 @pytest.mark.parametrize(
     "test_case",
-    fetch_temporary_tests(test_dirs),
+    fetch_tests(EEST_BLOCKCHAIN_TESTS_DIR),
     ids=idfn,
 )
-def test_execution_specs_generated_tests(test_case: Dict) -> None:
-    run_osaka_blockchain_st_tests(test_case)
+def test_eest_tests(test_case: Dict) -> None:
+    run_tests(test_case)