genlayer-test 0.1.0b1__tar.gz → 0.1.0b3__tar.gz

{genlayer_test-0.1.0b1 → genlayer_test-0.1.0b3}/PKG-INFO

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

{genlayer_test-0.1.0b1 → genlayer_test-0.1.0b3}/genlayer_test.egg-info/PKG-INFO

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

{genlayer_test-0.1.0b1 → genlayer_test-0.1.0b3}/genlayer_test.egg-info/SOURCES.txt

@@ -8,11 +8,14 @@ genlayer_test.egg-info/requires.txt
 genlayer_test.egg-info/top_level.txt
 gltest/__init__.py
 gltest/assertions.py
-gltest/cli.py
 gltest/exceptions.py
+gltest/plugin_config.py
+gltest/plugin_hooks.py
+gltest/types.py
 gltest/artifacts/__init__.py
 gltest/artifacts/contract.py
 gltest/glchain/__init__.py
 gltest/glchain/account.py
 gltest/glchain/client.py
-gltest/glchain/contract.py
+gltest/glchain/contract.py
+gltest_cli/main.py

genlayer_test-0.1.0b3/genlayer_test.egg-info/entry_points.txt

@@ -0,0 +1,5 @@
+[console_scripts]
+gltest = gltest_cli.main:main
+
+[pytest11]
+gltest = gltest.plugin_hooks

{genlayer_test-0.1.0b1 → genlayer_test-0.1.0b3}/genlayer_test.egg-info/top_level.txt

@@ -1,4 +1,5 @@
 build
 dist
 gltest
+gltest_cli
 tests

genlayer_test-0.1.0b3/gltest/artifacts/contract.py

@@ -0,0 +1,86 @@
+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
+class ContractDefinition:
+    """Class that represents a contract definition from a .gpy file."""
+
+    contract_name: str
+    contract_code: Union[str, bytes]
+    main_file_path: Path
+    runner_file_path: Optional[Path]
+
+
+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 file_path
+        except Exception as e:
+            raise ValueError(f"Error reading file {file_path}: {e}")
+    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,
+    )

{genlayer_test-0.1.0b1 → genlayer_test-0.1.0b3}/gltest/glchain/contract.py

@@ -3,7 +3,7 @@ from gltest.artifacts import find_contract_definition
 from gltest.assertions import tx_execution_failed
 from gltest.exceptions import DeploymentError
 from .client import get_gl_client
-from genlayer_py.types import CalldataEncodable, GenLayerTransaction
+from gltest.types import CalldataEncodable, GenLayerTransaction, TransactionStatus
 from eth_account.signers.local import LocalAccount
 from typing import List, Any, Type, Optional, Dict, Callable
 import types
@@ -18,36 +18,47 @@ class Contract:
 
     address: str
     account: Optional[LocalAccount] = None
+    _schema: Optional[Dict[str, Any]] = None
 
     @classmethod
-    def from_address_and_schema(
-        cls, address: str, schema: Dict[str, Any]
+    def new(
+        cls,
+        address: str,
+        schema: Dict[str, Any],
+        account: Optional[LocalAccount] = None,
     ) -> "Contract":
         """
         Build the methods from the schema.
         """
         if not isinstance(schema, dict) or "methods" not in schema:
             raise ValueError("Invalid schema: must contain 'methods' field")
+        instance = cls(address=address, _schema=schema, account=account)
+        instance._build_methods_from_schema()
+        return instance
 
-        instance = cls(address=address)
-        for method_name, method_info in schema["methods"].items():
+    def _build_methods_from_schema(self):
+        if self._schema is None:
+            raise ValueError("No schema provided")
+        for method_name, method_info in self._schema["methods"].items():
             if not isinstance(method_info, dict) or "readonly" not in method_info:
                 raise ValueError(
-                    f"Invalid method info for {method_name}: must contain 'readonly' field"
+                    f"Invalid method info for '{method_name}': must contain 'readonly' field"
                 )
-            setattr(
-                instance,
-                method_name,
-                types.MethodType(
-                    cls.contract_method_factory(method_name, method_info["readonly"]),
-                    instance,
-                ),
+            method_func = self.contract_method_factory(
+                method_name, method_info["readonly"]
             )
-        return instance
+            bound_method = types.MethodType(method_func, self)
+            setattr(self, method_name, bound_method)
 
     def connect(self, account: LocalAccount) -> "Contract":
-        self.account = account
-        return self
+        """
+        Create a new instance of the contract with the same methods and a different account.
+        """
+        new_contract = self.__class__(
+            address=self.address, account=account, _schema=self._schema
+        )
+        new_contract._build_methods_from_schema()
+        return new_contract
 
     @staticmethod
     def contract_method_factory(method_name: str, read_only: bool) -> Callable:
@@ -78,6 +89,9 @@ class Contract:
             leader_only: bool = False,
             wait_interval: Optional[int] = None,
             wait_retries: Optional[int] = None,
+            wait_transaction_status: TransactionStatus = TransactionStatus.FINALIZED,
+            wait_triggered_transactions: bool = True,
+            wait_triggered_transactions_status: TransactionStatus = TransactionStatus.ACCEPTED,
         ) -> GenLayerTransaction:
             """
             Wrapper to the contract write method.
@@ -98,8 +112,18 @@ class Contract:
             if wait_retries is not None:
                 extra_args["retries"] = wait_retries
             receipt = client.wait_for_transaction_receipt(
-                transaction_hash=tx_hash, status="FINALIZED", **extra_args
+                transaction_hash=tx_hash,
+                status=wait_transaction_status,
+                **extra_args,
             )
+            if wait_triggered_transactions:
+                triggered_transactions = receipt["triggered_transactions"]
+                for triggered_transaction in triggered_transactions:
+                    client.wait_for_transaction_receipt(
+                        transaction_hash=triggered_transaction,
+                        status=wait_triggered_transactions_status,
+                        **extra_args,
+                    )
             return receipt
 
         return read_contract_wrapper if read_only else write_contract_wrapper
@@ -138,6 +162,7 @@ class ContractFactory:
         leader_only: bool = False,
         wait_interval: Optional[int] = None,
         wait_retries: Optional[int] = None,
+        wait_transaction_status: TransactionStatus = TransactionStatus.FINALIZED,
     ) -> Contract:
         """
         Deploy the contract
@@ -157,9 +182,8 @@ class ContractFactory:
             if wait_retries is not None:
                 extra_args["retries"] = wait_retries
             tx_receipt = client.wait_for_transaction_receipt(
-                transaction_hash=tx_hash, status="FINALIZED", **extra_args
+                transaction_hash=tx_hash, status=wait_transaction_status, **extra_args
             )
-
             if (
                 not tx_receipt
                 or "data" not in tx_receipt
@@ -176,8 +200,8 @@ class ContractFactory:
 
             contract_address = tx_receipt["data"]["contract_address"]
             schema = client.get_contract_schema(address=contract_address)
-            return Contract.from_address_and_schema(
-                address=contract_address, schema=schema
+            return Contract.new(
+                address=contract_address, schema=schema, account=account
             )
         except Exception as e:
             raise DeploymentError(

genlayer_test-0.1.0b3/gltest/plugin_config.py

@@ -0,0 +1,12 @@
+from pathlib import Path
+
+_contracts_dir = None
+
+
+def set_contracts_dir(path: Path):
+    global _contracts_dir
+    _contracts_dir = path
+
+
+def get_contracts_dir() -> Path:
+    return Path(_contracts_dir)

genlayer_test-0.1.0b3/gltest/plugin_hooks.py

@@ -0,0 +1,16 @@
+from gltest.plugin_config import set_contracts_dir
+from pathlib import Path
+
+
+def pytest_addoption(parser):
+    parser.addoption(
+        "--contracts-dir",
+        action="store",
+        default="contracts",
+        help="Directory containing contract files",
+    )
+
+
+def pytest_configure(config):
+    contracts_dir = config.getoption("--contracts-dir")
+    set_contracts_dir(Path(contracts_dir))

genlayer_test-0.1.0b3/gltest/types.py

@@ -0,0 +1,7 @@
+# Re-export genlayer-py types
+from genlayer_py.types import (
+    CalldataAddress,
+    GenLayerTransaction,
+    TransactionStatus,
+    CalldataEncodable,
+)

{genlayer_test-0.1.0b1 → genlayer_test-0.1.0b3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "genlayer-test"
-version = "0.1.0b1"
+version = "0.1.0b3"
 description = "GenLayer Testing Suite"
 authors = [
     { name = "GenLayer" }
@@ -30,5 +30,8 @@ classifiers = [
 [tool.setuptools.packages.find]
 where = ["."]
 
+[project.entry-points.pytest11]
+gltest = "gltest.plugin_hooks"
+
 [project.scripts]
-gltest = "gltest.cli:main"
+gltest = "gltest_cli.main:main"

genlayer_test-0.1.0b1/genlayer_test.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-gltest = gltest.cli:main

genlayer_test-0.1.0b1/gltest/artifacts/contract.py

@@ -1,52 +0,0 @@
-import ast
-from pathlib import Path
-from typing import Optional
-from dataclasses import dataclass
-
-
-@dataclass
-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
-
-
-def find_contract_definition(
-    contract_name: str, relative_contracts_dir: str = "contracts"
-) -> Optional[ContractDefinition]:
-    """
-    Search in the contracts directory for a contract definition.
-    TODO: Make this more robust to handle imports and other files.
-    """
-    # Use provided directory or default to 'contracts' in current working directory
-    contracts_dir = Path.cwd() / relative_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
-    for file_path in contracts_dir.glob("*.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,
-                    )
-        except Exception as e:
-            raise ValueError(f"Error reading file {file_path}: {e}")
-    return None