diff --git a/lib/fixtures.py b/lib/fixtures.py deleted file mode 100644 index 78e6a63..0000000 --- a/lib/fixtures.py +++ /dev/null @@ -1,36 +0,0 @@ -import eth_utils -import os -import subprocess -from typing import List - -from sclients import SUPPORTED_CLIENTS, InstanceConfig, start_instance, stop_instance - -from lib.instance_configs import DEFAULT_INSTANCE_CONFIG -from lib.types import Fixture - - -def extract_fixtures(clients_to_test=SUPPORTED_CLIENTS) -> List[Fixture]: - fixtures = [] - for client in SUPPORTED_CLIENTS: - if client not in clients_to_test: - continue - - instance_config = { - **DEFAULT_INSTANCE_CONFIG, - 'client': client - } - - fixture = Fixture(client, [InstanceConfig.from_dict(instance_config)]) - fixtures.append(fixture) - - return fixtures - - -def setup_fixture(fixture: Fixture): - for instance in fixture.instances: - start_instance(instance) - - -def teardown_fixture(fixture: Fixture): - for instance in fixture.instances: - stop_instance(instance.client) diff --git a/lib/types.py b/lib/types.py deleted file mode 100644 index 2ad75c1..0000000 --- a/lib/types.py +++ /dev/null @@ -1,8 +0,0 @@ -from typing import List, NamedTuple - -from sclients import InstanceConfig - - -class Fixture(NamedTuple): - name: str - instances: List[InstanceConfig] diff --git a/steth.py b/steth.py index 138daab..6b4d28c 100755 --- a/steth.py +++ b/steth.py @@ -5,7 +5,6 @@ import yaml from sclients import SUPPORTED_CLIENTS, start_instance, stop_instance -from lib.fixtures import extract_fixtures, setup_fixture, teardown_fixture from lib.instance_configs import DEFAULT_ARGS from lib.runner import run_test_files from lib.logging_tests import get_logging_test_groups