diff --git a/compat/main.py b/compat/main.py
index 1da0c95d21..9a973e9a80 100644
--- a/compat/main.py
+++ b/compat/main.py
@@ -1,43 +1,22 @@
from __future__ import annotations
-import dataclasses
-import html
-import json
import logging
import os
-import re
import shlex
import shutil
+import stat
import subprocess
-import sys
-import textwrap
-from collections import defaultdict
from contextlib import contextmanager
from dataclasses import dataclass, field
-from enum import Enum, unique
from pathlib import Path
-from typing import List, Optional, Collection, Dict, IO, Any
-from typing_extensions import Protocol, Literal
+from typing import List, Optional, Collection, Dict
import click as click
import coloredlogs
-import tabulate
import yaml
-from click.utils import LazyFile
from dacite import from_dict
SUITE_PATH = Path("suite").resolve()
-CMD_PATH = Path("../runtime/cmd").resolve()
-PARSER_PATH = Path("parse").resolve()
-CHECKER_PATH = Path("check").resolve()
-
-ansi_escape_pattern = re.compile(r'\x1b[^m]*m')
-
-
-class Openable(Protocol):
- def open(self) -> IO:
- pass
-
@contextmanager
def cwd(path):
@@ -48,91 +27,34 @@ def cwd(path):
finally:
os.chdir(oldpwd)
-
-@dataclass
-class File:
- path: str
- prepare: Optional[str]
- member_account_access: List[str] = field(default_factory=list)
-
- def rewrite(self, path: Path):
- if not isinstance(self.prepare, str):
- return
-
- logger.info(f"Preparing {path}")
-
- source: str
- with path.open(mode="r") as f:
- source = f.read()
-
- def replace(pattern, replacement):
- nonlocal source
- source = re.sub(pattern, replacement, source)
-
- variables = {"replace": replace}
- with cwd(str(path.parent.absolute())):
- exec(self.prepare, variables)
-
- with path.open(mode="w") as f:
- f.write(source)
-
- @classmethod
- def parse(cls, path: Path, use_json: bool, bench: bool) -> (bool, Optional):
- return cls._run(PARSER_PATH, "Parsing", path, use_json, bench)
-
- def check(self, path: Path, use_json: bool, bench: bool) -> (bool, Optional):
- extra_args = [
- f"-memberAccountAccess=S.{path}:S.{(path.parent / Path(other_path)).resolve()}"
- for other_path in self.member_account_access
- ]
- return self._run(CHECKER_PATH, "Checking", path, use_json, bench, extra_args)
-
- @staticmethod
- def _run(
- tool_path: Path,
- verb: str,
- path: Path,
- use_json: bool,
- bench: bool,
- extra_args: List[str] = None
- ) -> (bool, Optional):
- logger.info(f"{verb} {path}")
- json_args = ["-json"] if use_json else []
- bench_args = ["-bench"] if bench else []
- args = json_args + bench_args + (extra_args or [])
-
- completed_process = subprocess.run(
- [tool_path, *args, path],
- cwd=str(path.parent),
- capture_output=use_json
- )
- result = None
- if use_json:
- result = json.loads(completed_process.stdout)
-
- if completed_process.returncode != 0:
- logger.error(f"{verb} failed: {path}")
- return False, result
-
- return True, result
-
-
@dataclass
class GoTest:
path: str
command: str
- def run(self, working_dir: Path, prepare: bool, go_test_ref: Optional[str]) -> bool:
- if go_test_ref:
- replacement = f'github.com/onflow/cadence@{go_test_ref}'
+ def run(self, working_dir: Path, prepare: bool, cadence_version: Optional[str], flowgo_version: Optional[str]) -> bool:
+ if cadence_version:
+ cadence_replacement = f'github.com/onflow/cadence@{cadence_version}'
else:
- replacement = shlex.quote(str(Path.cwd().parent.absolute()))
+ # default: point to local cadence repo
+ cadence_replacement = shlex.quote(Path.cwd().parent.absolute().resolve().as_posix())
+
+ if flowgo_version:
+ flowgo_replacement = f'github.com/onflow/flow-go@{flowgo_version}'
+ else:
+ # default: use the newest version of flow-go available
+ flowgo_replacement = f'github.com/onflow/flow-go@latest'
with cwd(working_dir / self.path):
if prepare:
+ logger.info("Editing dependencies")
+ subprocess.run([
+ "go", "get", flowgo_replacement,
+ ])
subprocess.run([
- "go", "mod", "edit", "-replace", f'github.com/onflow/cadence={replacement}',
+ "go", "mod", "edit", "-replace", f'github.com/onflow/cadence={cadence_replacement}',
])
+ logger.info("Downloading dependencies")
subprocess.run([
"go", "get", "-t", ".",
])
@@ -140,40 +62,6 @@ def run(self, working_dir: Path, prepare: bool, go_test_ref: Optional[str]) -> b
result = subprocess.run(shlex.split(self.command))
return result.returncode == 0
-
-@dataclass
-class BenchmarkResult:
- iterations: int
- time: int
-
-
-@dataclass
-class ParseResult:
- error: Optional[Any] = field(default=None)
- bench: Optional[BenchmarkResult] = field(default=None)
-
- @classmethod
- def from_dict(cls, data: Dict):
- return from_dict(data_class=cls, data=data)
-
-
-@dataclass
-class CheckResult:
- error: Optional[Any] = field(default=None)
- bench: Optional[BenchmarkResult] = field(default=None)
-
- @classmethod
- def from_dict(cls, data: Dict):
- return from_dict(data_class=cls, data=data)
-
-
-@dataclass
-class Result:
- path: str
- parse_result: ParseResult
- check_result: Optional[CheckResult] = field(default=None)
-
-
def load_index(path: Path) -> List[str]:
logger.info(f"Loading suite index from {path} ...")
with path.open(mode="r") as f:
@@ -184,7 +72,6 @@ class Description:
description: str
url: str
branch: str
- files: List[File] = field(default_factory=list)
go_tests: List[GoTest] = field(default_factory=list)
@staticmethod
@@ -200,6 +87,11 @@ def from_dict(cls, data: Dict):
def _clone(self, working_dir: Path):
if working_dir.exists():
+ for root, dirs, files in os.walk(working_dir):
+ for dir in dirs:
+ os.chmod(os.path.join(root, dir), stat.S_IRUSR | stat.S_IWUSR)
+ for file in files:
+ os.chmod(os.path.join(root, file), stat.S_IRUSR | stat.S_IWUSR)
shutil.rmtree(working_dir)
logger.info(f"Cloning {self.url} ({self.branch})")
@@ -210,69 +102,25 @@ def run(
self,
name: str,
prepare: bool,
- use_json: bool,
- bench: bool,
- check: bool,
go_test: bool,
- go_test_ref: Optional[str],
- ) -> (bool, List[Result]):
+ cadence_version: Optional[str],
+ flowgo_version: Optional[str],
+ ) -> (bool):
working_dir = SUITE_PATH / name
if prepare:
self._clone(working_dir)
- results: List[Result] = []
- check_succeeded = True
- if check:
- check_succeeded, results = self.check(working_dir, prepare=prepare, use_json=use_json, bench=bench)
-
go_tests_succeeded = True
if go_test:
for test in self.go_tests:
- if not test.run(working_dir, prepare=prepare, go_test_ref=go_test_ref):
+ if not test.run(working_dir, prepare=prepare, cadence_version=cadence_version, flowgo_version=flowgo_version):
go_tests_succeeded = False
- succeeded = check_succeeded and go_tests_succeeded
-
- return succeeded, results
-
- def check(self, working_dir: Path, prepare: bool, use_json: bool, bench: bool) -> (bool, List[Result]):
-
- run_succeeded = True
-
- results: List[Result] = []
-
- for file in self.files:
- path = working_dir.joinpath(file.path)
-
- if prepare:
- file.rewrite(path)
-
- parse_succeeded, parse_results = \
- File.parse(path, use_json=use_json, bench=bench)
- result = Result(
- path=str(path),
- parse_result=ParseResult.from_dict(parse_results[0]) if parse_results else None
- )
- if not parse_succeeded:
- run_succeeded = False
- if use_json:
- results.append(result)
- continue
-
- check_succeeded, check_results = \
- file.check(path, use_json=use_json, bench=bench)
- if check_results:
- result.check_result = CheckResult.from_dict(check_results[0])
- if use_json:
- results.append(result)
- if not check_succeeded:
- run_succeeded = False
- continue
-
- return run_succeeded, results
+ succeeded = go_tests_succeeded
+ return succeeded
class Git:
@@ -300,371 +148,6 @@ def checkout(ref: str):
raise Exception(f'failed to checkout ref {ref}')
-def build(name):
- logger.info(f"Building {name}")
- subprocess.run(["go", "build", CMD_PATH / name])
-
-
-class EnhancedJSONEncoder(json.JSONEncoder):
- def default(self, o):
- if dataclasses.is_dataclass(o):
- return dataclasses.asdict(o)
- if isinstance(o, Enum):
- return o.value
- return super().default(o)
-
-
-def indent(text: str) -> str:
- return textwrap.indent(text, " ")
-
-
-def format_markdown_details(details: str) -> str:
- stripped = ansi_escape_pattern.sub('', details)
- escaped = html.escape(stripped).replace("\n", "
")
- return f"Details
{escaped}