removed solc dependency (#1759)

Author: felix314159

pytest-check-eip-versions.ini

@@ -11,7 +11,6 @@ addopts =
     -p pytest_plugins.spec_version_checker.spec_version_checker
     -p pytest_plugins.concurrency
     -p pytest_plugins.filler.pre_alloc
-    -p pytest_plugins.solc.solc
     -p pytest_plugins.filler.filler
     -p pytest_plugins.shared.execute_fill
     -p pytest_plugins.forks.forks

pytest-execute-hive.ini

@@ -11,7 +11,6 @@ addopts =
     -p pytest_plugins.concurrency
     -p pytest_plugins.execute.sender
     -p pytest_plugins.execute.pre_alloc
-    -p pytest_plugins.solc.solc
     -p pytest_plugins.execute.rpc.hive
     -p pytest_plugins.execute.execute
     -p pytest_plugins.shared.execute_fill

pytest-execute.ini

@@ -12,7 +12,6 @@ addopts =
     -p pytest_plugins.concurrency
     -p pytest_plugins.execute.sender
     -p pytest_plugins.execute.pre_alloc
-    -p pytest_plugins.solc.solc
     -p pytest_plugins.execute.execute
     -p pytest_plugins.shared.execute_fill
     -p pytest_plugins.execute.rpc.remote_seed_sender

pytest.ini

@@ -11,9 +11,7 @@ markers =
 addopts = 
     -p pytest_plugins.concurrency
     -p pytest_plugins.filler.pre_alloc
-    -p pytest_plugins.solc.solc
     -p pytest_plugins.filler.filler
-    -p pytest_plugins.filler.static_filler
     -p pytest_plugins.filler.ported_tests
     -p pytest_plugins.shared.execute_fill
     -p pytest_plugins.forks.forks

src/ethereum_test_tools/__init__.py

@@ -82,8 +82,6 @@
     Initcode,
     Switch,
     While,
-    Yul,
-    YulCompiler,
 )
 from .utility.generators import (
     DeploymentTestType,
@@ -157,8 +155,6 @@
     "While",
     "Withdrawal",
     "WithdrawalRequest",
-    "Yul",
-    "YulCompiler",
     "add_kzg_version",
     "call_return_code",
     "ceiling_division",

src/pytest_plugins/filler/filler.py

@@ -764,6 +764,11 @@ def fixture_collector(
     Return configured fixture collector instance used for all tests
     in one test module.
     """
+    # Dynamically load the 'static_filler' and 'solc' plugins if needed
+    if request.config.getoption("fill_static_tests_enabled"):
+        request.config.pluginmanager.import_plugin("pytest_plugins.filler.static_filler")
+        request.config.pluginmanager.import_plugin("pytest_plugins.solc.solc")
+
     fixture_collector = FixtureCollector(
         output_dir=fixture_output.directory,
         flat_output=fixture_output.flat_output,

src/pytest_plugins/filler/static_filler.py

@@ -17,8 +17,13 @@
 from _pytest.python import Module
 
 from ethereum_test_fixtures import BaseFixture, LabeledFixtureFormat
-from ethereum_test_forks import Fork
+from ethereum_test_forks import (
+    Fork,
+    get_closest_fork_with_solc_support,
+    get_forks_with_solc_support,
+)
 from ethereum_test_specs import BaseStaticTest, BaseTest
+from ethereum_test_tools.code.yul import Yul
 
 from ..forks.forks import ValidityMarker, get_intersection_set
 from ..shared.helpers import labeled_format_parameter_set
@@ -109,18 +114,6 @@ def get_all_combinations_from_parametrize_marks(
     return all_argument_names, all_value_combinations
 
 
-def pytest_addoption(parser: pytest.Parser):
-    """Add command-line options to pytest."""
-    static_filler_group = parser.getgroup("static", "Arguments defining static filler behavior")
-    static_filler_group.addoption(
-        "--fill-static-tests",
-        action="store_true",
-        dest="fill_static_tests_enabled",
-        default=None,
-        help=("Enable reading and filling from static test files."),
-    )
-
-
 def pytest_collect_file(file_path: Path, parent) -> pytest.Collector | None:
     """Pytest hook that collects test cases from static files and fills them into test fixtures."""
     fill_static_tests_enabled = parent.config.getoption("fill_static_tests_enabled")
@@ -334,3 +327,46 @@ def runtest(self):
     def reportinfo(self):
         """Provide information for test reporting."""
         return self.fspath, 0, f"Static file test: {self.name}"
+
+
+@pytest.fixture
+def yul(fork: Fork, request: pytest.FixtureRequest):
+    """
+    Fixture that allows contract code to be defined with Yul code.
+
+    This fixture defines a class that wraps the ::ethereum_test_tools.Yul
+    class so that upon instantiation within the test case, it provides the
+    test case's current fork parameter. The forks is then available for use
+    in solc's arguments for the Yul code compilation.
+
+    Test cases can override the default value by specifying a fixed version
+    with the @pytest.mark.compile_yul_with(FORK) marker.
+    """
+    solc_target_fork: Fork | None
+    marker = request.node.get_closest_marker("compile_yul_with")
+    assert hasattr(request.config, "solc_version"), "solc_version not set in pytest config."
+    if marker:
+        if not marker.args[0]:
+            pytest.fail(
+                f"{request.node.name}: Expected one argument in 'compile_yul_with' marker."
+            )
+        for fork in request.config.all_forks:  # type: ignore
+            if fork.name() == marker.args[0]:
+                solc_target_fork = fork
+                break
+        else:
+            pytest.fail(f"{request.node.name}: Fork {marker.args[0]} not found in forks list.")
+        assert solc_target_fork in get_forks_with_solc_support(request.config.solc_version)
+    else:
+        solc_target_fork = get_closest_fork_with_solc_support(fork, request.config.solc_version)
+        assert solc_target_fork is not None, "No fork supports provided solc version."
+        if solc_target_fork != fork and request.config.getoption("verbose") >= 1:
+            warnings.warn(
+                f"Compiling Yul for {solc_target_fork.name()}, not {fork.name()}.", stacklevel=2
+            )
+
+    class YulWrapper(Yul):
+        def __new__(cls, *args, **kwargs):
+            return super(YulWrapper, cls).__new__(cls, *args, **kwargs, fork=solc_target_fork)
+
+    return YulWrapper

src/pytest_plugins/shared/execute_fill.py

@@ -1,19 +1,12 @@
 """Shared pytest fixtures and hooks for EEST generation modes (fill and execute)."""
 
-import warnings
 from typing import List
 
 import pytest
 
 from ethereum_test_execution import BaseExecute, LabeledExecuteFormat
 from ethereum_test_fixtures import BaseFixture, LabeledFixtureFormat
-from ethereum_test_forks import (
-    Fork,
-    get_closest_fork_with_solc_support,
-    get_forks_with_solc_support,
-)
 from ethereum_test_specs import BaseTest
-from ethereum_test_tools import Yul
 from pytest_plugins.spec_version_checker.spec_version_checker import EIPSpecTestItem
 
 
@@ -102,49 +95,6 @@ def pytest_configure(config: pytest.Config):
     )
 
 
-@pytest.fixture
-def yul(fork: Fork, request: pytest.FixtureRequest):
-    """
-    Fixture that allows contract code to be defined with Yul code.
-
-    This fixture defines a class that wraps the ::ethereum_test_tools.Yul
-    class so that upon instantiation within the test case, it provides the
-    test case's current fork parameter. The forks is then available for use
-    in solc's arguments for the Yul code compilation.
-
-    Test cases can override the default value by specifying a fixed version
-    with the @pytest.mark.compile_yul_with(FORK) marker.
-    """
-    solc_target_fork: Fork | None
-    marker = request.node.get_closest_marker("compile_yul_with")
-    assert hasattr(request.config, "solc_version"), "solc_version not set in pytest config."
-    if marker:
-        if not marker.args[0]:
-            pytest.fail(
-                f"{request.node.name}: Expected one argument in 'compile_yul_with' marker."
-            )
-        for fork in request.config.all_forks:  # type: ignore
-            if fork.name() == marker.args[0]:
-                solc_target_fork = fork
-                break
-        else:
-            pytest.fail(f"{request.node.name}: Fork {marker.args[0]} not found in forks list.")
-        assert solc_target_fork in get_forks_with_solc_support(request.config.solc_version)
-    else:
-        solc_target_fork = get_closest_fork_with_solc_support(fork, request.config.solc_version)
-        assert solc_target_fork is not None, "No fork supports provided solc version."
-        if solc_target_fork != fork and request.config.getoption("verbose") >= 1:
-            warnings.warn(
-                f"Compiling Yul for {solc_target_fork.name()}, not {fork.name()}.", stacklevel=2
-            )
-
-    class YulWrapper(Yul):
-        def __new__(cls, *args, **kwargs):
-            return super(YulWrapper, cls).__new__(cls, *args, **kwargs, fork=solc_target_fork)
-
-    return YulWrapper
-
-
 @pytest.fixture(scope="function")
 def test_case_description(request: pytest.FixtureRequest) -> str:
     """Fixture to extract and combine docstrings from the test class and the test function."""
@@ -198,3 +148,15 @@ def __init__(self, message):
             + "properly generate a test: "
             + ", ".join(SPEC_TYPES_PARAMETERS)
         )
+
+
+def pytest_addoption(parser: pytest.Parser):
+    """Add command-line options to pytest."""
+    static_filler_group = parser.getgroup("static", "Arguments defining static filler behavior")
+    static_filler_group.addoption(
+        "--fill-static-tests",
+        action="store_true",
+        dest="fill_static_tests_enabled",
+        default=None,
+        help=("Enable reading and filling from static test files."),
+    )