removed solc dependency from ci

Author: felix314159

src/ethereum_test_tools/tests/conftest.py

@@ -7,7 +7,7 @@
 
 from ..code import Solc
 
-SOLC_PADDING_VERSION = Version.parse("0.8.21")
+SOLC_PADDING_VERSION = Version.parse("0.8.24")
 
 
 @pytest.fixture(scope="session")

src/ethereum_test_tools/tests/test_code.py

@@ -1,28 +1,27 @@
 """Test suite for `ethereum_test.code` module."""
 
 from string import Template
-from typing import Mapping, SupportsBytes
+from typing import Mapping
 
 import pytest
 from semver import Version
 
 from ethereum_clis import TransitionTool
-from ethereum_test_base_types import Account, Address, Bytes, Hash, TestAddress, TestPrivateKey
+from ethereum_test_base_types import Account, Address, Hash, TestAddress, TestPrivateKey
 from ethereum_test_fixtures import BlockchainFixture
 from ethereum_test_forks import (
     Cancun,
     Fork,
     Homestead,
     Shanghai,
-    get_closest_fork_with_solc_support,
     get_deployed_forks,
 )
 from ethereum_test_specs import StateTest
 from ethereum_test_types import Alloc, Environment, Transaction
 from ethereum_test_vm import Opcodes as Op
 from ethereum_test_vm import UndefinedOpcodes
 
-from ..code import CalldataCase, Case, Conditional, Initcode, Solc, Switch, Yul
+from ..code import CalldataCase, Case, Conditional, Initcode, Switch
 from .conftest import SOLC_PADDING_VERSION
 
 
@@ -32,27 +31,6 @@ def fork(request: pytest.FixtureRequest):
     return request.param
 
 
-@pytest.fixture()
-def yul_code(
-    request: pytest.FixtureRequest,
-    fork: Fork,
-    padding_before: str | None,
-    padding_after: str | None,
-) -> bytes:
-    """Return the Yul code for the test."""
-    yul_code_snippets = request.param
-    compiled_yul_code = b""
-    if padding_before is not None:
-        compiled_yul_code += Bytes(padding_before)
-    for yul_code in yul_code_snippets:
-        compiled_yul_code += bytes(
-            Yul(yul_code, fork=get_closest_fork_with_solc_support(fork, Solc().version))
-        )
-    if padding_after is not None:
-        compiled_yul_code += Bytes(padding_after)
-    return compiled_yul_code
-
-
 @pytest.fixture()
 def expected_bytes(request: pytest.FixtureRequest, solc_version: Version, fork: Fork):
     """Return the expected bytes for the test."""
@@ -74,83 +52,6 @@ def expected_bytes(request: pytest.FixtureRequest, solc_version: Version, fork:
     raise Exception("Unsupported expected_bytes type: {}".format(type(expected_bytes)))
 
 
-@pytest.mark.parametrize(
-    ["yul_code", "padding_before", "padding_after", "expected_bytes"],
-    [
-        pytest.param(
-            (
-                """
-                {
-                    sstore(1, 2)
-                }
-                """,
-            ),
-            None,
-            None,
-            Template("6002600155${solc_padding}"),
-            id="simple",
-        ),
-        pytest.param(
-            (
-                """
-                {
-                    sstore(1, 2)
-                }
-                """,
-            ),
-            None,
-            "0x00",
-            Template("6002600155${solc_padding}00"),
-            id="simple-with-padding",
-        ),
-        pytest.param(
-            (
-                """
-                {
-                    sstore(1, 2)
-                }
-                """,
-            ),
-            "0x00",
-            None,
-            Template("006002600155${solc_padding}"),
-            id="simple-with-padding-2",
-        ),
-        pytest.param(
-            (
-                """
-                {
-                    sstore(1, 2)
-                }
-                """,
-                """
-                {
-                    sstore(3, 4)
-                }
-                """,
-            ),
-            None,
-            None,
-            Template("6002600155${solc_padding}6004600355${solc_padding}"),
-            id="multiple",
-        ),
-        pytest.param(
-            ("{\n" + "\n".join(["sstore({0}, {0})".format(i) for i in range(5000)]) + "\n}",),
-            None,
-            None,
-            b"".join([b"\x60" + i.to_bytes(1, "big") + b"\x80\x55" for i in range(256)])
-            + b"".join([b"\x61" + i.to_bytes(2, "big") + b"\x80\x55" for i in range(256, 5000)]),
-            id="large",
-        ),
-    ],
-    indirect=["yul_code", "expected_bytes"],
-)
-def test_yul(  # noqa: D103
-    yul_code: SupportsBytes, expected_bytes: bytes, padding_before: str, padding_after: str
-):
-    assert bytes(yul_code) == expected_bytes
-
-
 @pytest.mark.parametrize(
     "initcode,bytecode",
     [

tox.ini

@@ -66,65 +66,9 @@ setenv =
     # Use custom EELS_RESOLUTIONS_FILE if it is set via the environment (eg, in CI)
     EELS_RESOLUTIONS_FILE = {env:EELS_RESOLUTIONS_FILE:}
     CI = {env:CI:}
-    # Add the solc binary directory to PATH
-    PATH = {envdir}/bin{:}{env:PATH}
 extras = 
     test
-    lint # Required `gentest` for formatting tests
-allowlist_externals =
-    sh
-    bash
-    mkdir
-    curl
-    chmod
-    test
-    solc
-    grep
-commands_pre =
-    # Create bin directory
-    mkdir -p {envdir}/bin
-    # if solc 0.8.24 exists already we are done, otherwise download it and verify version equals 0.8.24 (will fail on linux-arm64) 
-    sh -c 'echo "Checking for system solc..."; \
-        if command -v solc >/dev/null 2>&1; then \
-            SYSTEM_SOLC=$(command -v solc); \
-            echo "Found solc at $SYSTEM_SOLC"; \
-            VERSION_OUTPUT=$("$SYSTEM_SOLC" --version 2>&1); \
-            echo "Found solc version:"; \
-            echo "$VERSION_OUTPUT"; \
-            if echo "$VERSION_OUTPUT" | grep -q "Version: 0\.8\.24"; then \
-                echo "System solc is correct version, copying to tox env..."; \
-                mkdir -p {envdir}/bin; \
-                cp "$SYSTEM_SOLC" {envdir}/bin/solc; \
-                exit 0; \
-            else \
-                echo "This is not the correct version, expected 0.8.24."; \
-            fi; \
-        fi; \
-        for dir in "{envdir}/bin" "{envdir}/local/bin"; do \
-            if [ -x "$dir/solc" ]; then \
-                echo "Found solc at $dir/solc"; \
-                VERSION_OUTPUT=$("$dir/solc" --version 2>&1); \
-                echo "Found solc version:"; \
-                echo "$VERSION_OUTPUT"; \
-                if echo "$VERSION_OUTPUT" | grep -q "Version: 0\.8\.24"; then \
-                    exit 0; \
-                else \
-                    echo "This is not the correct version, expected 0.8.24."; \
-                fi; \
-            fi; \
-        done; \
-        echo "Downloading solc 0.8.24..."; \
-        mkdir -p {envdir}/bin; \
-        if [ "$(uname)" = "Darwin" ]; then \
-            curl -L -o {envdir}/bin/solc https://github.com/ethereum/solidity/releases/download/v0.8.24/solc-macos; \
-        else \
-            curl -L -o {envdir}/bin/solc https://github.com/ethereum/solidity/releases/download/v0.8.24/solc-static-linux; \
-        fi; \
-        chmod +x {envdir}/bin/solc; \
-        echo "Downloaded solc to {envdir}/bin/solc"; \
-        echo "Verifying installation..."; \
-        {envdir}/bin/solc --version'
-        
+    lint # Required `gentest` for formatting tests 
 commands =
     pytest -c ./pytest-framework.ini -n auto -m "not run_in_serial"
     pytest -c ./pytest-framework.ini -m run_in_serial