genlayer-test 0.1.0b2__py3-none-any.whl → 0.1.0b3__py3-none-any.whl

{genlayer_test-0.1.0b2.dist-info → genlayer_test-0.1.0b3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: genlayer-test
-Version: 0.1.0b2
+Version: 0.1.0b3
 Summary: GenLayer Testing Suite
 Author: GenLayer
 License-Expression: MIT

{genlayer_test-0.1.0b2.dist-info → genlayer_test-0.1.0b3.dist-info}/RECORD

@@ -5,14 +5,14 @@ gltest/plugin_config.py,sha256=O9Dx9IejbBJe-CJ9h8iMVtLzjWlzLGcTGOIgJM6gLWc,204
 gltest/plugin_hooks.py,sha256=cy4-LPm3Q-ZaO94t5vgjbPjQB8MRxYGGRXeDBeJ7buU,399
 gltest/types.py,sha256=BODmwTr2gAUEiO9FjiuTiWwuKvXgo4xZWstQWNUfnlw,156
 gltest/artifacts/__init__.py,sha256=QCsQI8BSOHQwGWFxZVDRL-HA0Dyae3Re24E-yAZrflA,86
-gltest/artifacts/contract.py,sha256=BhY1m9FPQw_gyBNRXKxgjjCUD5z-i2M4BgjvXuinCNg,1639
+gltest/artifacts/contract.py,sha256=2wmfQF6FAiNuMlr9pePK7ZJjQj5Tl7-3SefeH3OnSRQ,3089
 gltest/glchain/__init__.py,sha256=wD2Hzdz_wKpu-mCAX5iBINZDCNdKezLVI2lywkSkjvw,400
 gltest/glchain/account.py,sha256=vOXxcR09NkT6iFw_m49DW1nVC7kP8wf23555iPPXRkw,402
 gltest/glchain/client.py,sha256=U_JJJQ0V8oLPLeIbGpFcHOtnCVPJIoN9DMlvHSD1C0I,355
 gltest/glchain/contract.py,sha256=46QFDjwwg6n0qmjMTPXR1wueV2ZdFOc1g2nas0U9C_c,7837
 gltest_cli/main.py,sha256=Ti2-0Ev1x5_cM0D1UKqdgaDt80CDHEQGtdRne2qLm4M,53
-genlayer_test-0.1.0b2.dist-info/METADATA,sha256=WPtruwU-TnN4r2W8DNZTmAmdPkEmWAVe0hFamcKXKrs,3409
-genlayer_test-0.1.0b2.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-genlayer_test-0.1.0b2.dist-info/entry_points.txt,sha256=rXhrPVq2IhVsd4uWzxzwCTx7jA1KcQIVNxDCUuxq4f8,89
-genlayer_test-0.1.0b2.dist-info/top_level.txt,sha256=GSdrnQbiLcZssmtCpbDgBTygsc8Bt_TPeYjwm0FmpdA,18
-genlayer_test-0.1.0b2.dist-info/RECORD,,
+genlayer_test-0.1.0b3.dist-info/METADATA,sha256=zzWsz5KgLuoQO7urlzrLz9BYQMmpP-QOiyZZB3zbeiw,3409
+genlayer_test-0.1.0b3.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+genlayer_test-0.1.0b3.dist-info/entry_points.txt,sha256=rXhrPVq2IhVsd4uWzxzwCTx7jA1KcQIVNxDCUuxq4f8,89
+genlayer_test-0.1.0b3.dist-info/top_level.txt,sha256=GSdrnQbiLcZssmtCpbDgBTygsc8Bt_TPeYjwm0FmpdA,18
+genlayer_test-0.1.0b3.dist-info/RECORD,,

{genlayer_test-0.1.0b2.dist-info → genlayer_test-0.1.0b3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.0)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

gltest/artifacts/contract.py

@@ -1,7 +1,11 @@
 import ast
 from typing import Optional
 from dataclasses import dataclass
+from pathlib import Path
 from gltest.plugin_config import get_contracts_dir
+import io
+import zipfile
+from typing import Union
 
 
 @dataclass
@@ -9,41 +13,74 @@ class ContractDefinition:
     """Class that represents a contract definition from a .gpy file."""
 
     contract_name: str
-    contract_code: str
-    source_file: str
-    ast_node: ast.ClassDef
+    contract_code: Union[str, bytes]
+    main_file_path: Path
+    runner_file_path: Optional[Path]
 
 
-def find_contract_definition(contract_name: str) -> Optional[ContractDefinition]:
-    """
-    Search in the contracts directory for a contract definition.
-    TODO: Make this more robust to handle imports and other files.
-    """
-    contracts_dir = get_contracts_dir()
-
-    if not contracts_dir.exists():
-        raise FileNotFoundError(f"Contracts directory not found at: {contracts_dir}")
-
-    # Search through all .gpy files in the contracts directory
+def search_path_by_class_name(contracts_dir: Path, contract_name: str) -> Path:
+    """Search for a file by class name in the contracts directory."""
     for file_path in contracts_dir.rglob("*.gpy"):
         try:
             # Read the file content
             with open(file_path, "r") as f:
                 content = f.read()
-
             # Parse the content into an AST
             tree = ast.parse(content)
-
             # Search for class definitions
             for node in ast.walk(tree):
                 if isinstance(node, ast.ClassDef) and node.name == contract_name:
                     # Found the contract class
-                    return ContractDefinition(
-                        contract_name=contract_name,
-                        source_file=str(file_path),
-                        contract_code=content,
-                        ast_node=node,
-                    )
+                    return file_path
         except Exception as e:
             raise ValueError(f"Error reading file {file_path}: {e}")
-    return None
+    raise FileNotFoundError(f"Contract {contract_name} not found at: {contracts_dir}")
+
+
+def compute_contract_code(
+    main_file_path: Path,
+    runner_file_path: Optional[Path] = None,
+) -> str:
+    """Compute the contract code."""
+    # Single file contract
+    if runner_file_path is None:
+        return main_file_path.read_text()
+
+    # Multifile contract
+    main_file_dir = main_file_path.parent
+    buffer = io.BytesIO()
+
+    with zipfile.ZipFile(buffer, mode="w") as zip:
+        zip.write(main_file_path, "contract/__init__.py")
+        for file_path in main_file_dir.rglob("*"):
+            if file_path.name in ["runner.json", "__init__.gpy"]:
+                continue
+            rel_path = file_path.relative_to(main_file_dir)
+            zip.write(file_path, f"contract/{rel_path}")
+        zip.write(runner_file_path, "runner.json")
+    buffer.flush()
+    return buffer.getvalue()
+
+
+def find_contract_definition(contract_name: str) -> Optional[ContractDefinition]:
+    """
+    Search in the contracts directory for a contract definition.
+    """
+    contracts_dir = get_contracts_dir()
+    if not contracts_dir.exists():
+        raise FileNotFoundError(f"Contracts directory not found at: {contracts_dir}")
+    main_file_path = search_path_by_class_name(contracts_dir, contract_name)
+    main_file_dir = main_file_path.parent
+    runner_file_path = None
+    if main_file_path.name == "__init__.gpy":
+        # Likely a multifile contract
+        runner_file_path = main_file_dir.joinpath("runner.json")
+        if not runner_file_path.exists():
+            # No runner file, so it's a single file contract
+            runner_file_path = None
+    return ContractDefinition(
+        contract_name=contract_name,
+        contract_code=compute_contract_code(main_file_path, runner_file_path),
+        main_file_path=main_file_path,
+        runner_file_path=runner_file_path,
+    )