Use TransitionTool.default_tool

Author: marioevz

src/ethereum_clis/clis/eels_t8n.py

@@ -22,7 +22,6 @@
 from cli.gen_index import generate_fixtures_index
 from config import AppConfig
 from ethereum_clis import TransitionTool
-from ethereum_clis.clis.eels_t8n import EELST8NWrapper
 from ethereum_clis.clis.geth import FixtureConsumerTool
 from ethereum_test_base_types import Account, Address, Alloc, ReferenceSpec
 from ethereum_test_fixtures import (
@@ -118,19 +117,12 @@ def default_html_report_file_path() -> str:
 def pytest_addoption(parser: pytest.Parser):
     """Add command-line options to pytest."""
     evm_group = parser.getgroup("evm", "Arguments defining evm executable behavior")
-    evm_group.addoption(
-        "--eels",
-        action="store_true",
-        dest="eels",
-        default=False,
-        help="Use eels t8n entry point",
-    )
     evm_group.addoption(
         "--evm-bin",
         action="store",
         dest="evm_bin",
         type=Path,
-        default="ethereum-spec-evm-resolver",
+        default=None,
         help=(
             "Path to an evm executable (or name of an executable in the PATH) that provides `t8n`."
             " Default: `ethereum-spec-evm-resolver`."
@@ -353,11 +345,13 @@ def pytest_configure(config):
 
     # Instantiate the transition tool here to check that the binary path/trace option is valid.
     # This ensures we only raise an error once, if appropriate, instead of for every test.
-    if config.getoption("eels", False):
-        t8n = EELST8NWrapper.default(trace=config.getoption("evm_collect_traces"))
+    evm_bin = config.getoption("evm_bin")
+    if evm_bin is None:
+        assert TransitionTool.default_tool is not None, "No default transition tool found"
+        t8n = TransitionTool.default_tool(trace=config.getoption("evm_collect_traces"))
     else:
         t8n = TransitionTool.from_binary_path(
-            binary_path=config.getoption("evm_bin"), trace=config.getoption("evm_collect_traces")
+            binary_path=evm_bin, trace=config.getoption("evm_collect_traces")
         )
         if (
             isinstance(config.getoption("numprocesses"), int)
@@ -549,7 +543,7 @@ def pytest_html_report_title(report):
 
 
 @pytest.fixture(autouse=True, scope="session")
-def evm_bin(request: pytest.FixtureRequest) -> Path:
+def evm_bin(request: pytest.FixtureRequest) -> Path | None:
     """Return configured evm tool binary path used to run t8n."""
     return request.config.getoption("evm_bin")
 
@@ -564,10 +558,13 @@ def verify_fixtures_bin(request: pytest.FixtureRequest) -> Path | None:
 
 
 @pytest.fixture(autouse=True, scope="session")
-def t8n(request: pytest.FixtureRequest, evm_bin: Path) -> Generator[TransitionTool, None, None]:
+def t8n(
+    request: pytest.FixtureRequest, evm_bin: Path | None
+) -> Generator[TransitionTool, None, None]:
     """Return configured transition tool."""
-    if request.config.getoption("eels"):
-        t8n = EELST8NWrapper.default(trace=request.config.getoption("evm_collect_traces"))
+    if evm_bin is None:
+        assert TransitionTool.default_tool is not None, "No default transition tool found"
+        t8n = TransitionTool.default_tool(trace=request.config.getoption("evm_collect_traces"))
     else:
         t8n = TransitionTool.from_binary_path(
             binary_path=evm_bin, trace=request.config.getoption("evm_collect_traces")
@@ -604,7 +601,7 @@ def do_fixture_verification(
 def evm_fixture_verification(
     request: pytest.FixtureRequest,
     do_fixture_verification: bool,
-    evm_bin: Path,
+    evm_bin: Path | None,
     verify_fixtures_bin: Path | None,
 ) -> Generator[FixtureConsumer | None, None, None]:
     """

src/pytest_plugins/filler/filler.py

@@ -14,7 +14,6 @@
 from pytest import Mark, Metafunc
 
 from ethereum_clis import TransitionTool
-from ethereum_clis.clis.eels_t8n import EELST8NWrapper
 from ethereum_test_forks import (
     Fork,
     get_deployed_forks,
@@ -525,14 +524,11 @@ def get_fork_option(config, option_name: str, parameter_name: str) -> Set[Fork]:
         return
 
     evm_bin = config.getoption("evm_bin", None)
-    eels = config.getoption("eels", False)
-
-    if eels:
-        t8n = EELST8NWrapper.default()
+    if evm_bin is None:
+        assert TransitionTool.default_tool is not None, "No default transition tool found"
+        t8n = TransitionTool.default_tool()
     elif evm_bin is not None:
         t8n = TransitionTool.from_binary_path(binary_path=evm_bin)
-    else:
-        pytest.exit("One of --eels or --evm-bin should be specified")
 
     config.unsupported_forks = frozenset(  # type: ignore
         fork for fork in selected_fork_set if not t8n.is_fork_supported(fork)