ProtostarFixture

protostar/commands/init/init_command.py

@@ -1,5 +1,4 @@
 from glob import glob
-from pathlib import Path
 from typing import List, Optional
 
 from protostar.cli import Command
@@ -18,13 +17,11 @@ def __init__(
         requester: InputRequester,
         new_project_creator: NewProjectCreator,
         adapted_project_creator: AdaptedProjectCreator,
-        cwd: Path,
     ) -> None:
         super().__init__()
         self._adapted_project_creator = adapted_project_creator
         self._new_project_creator = new_project_creator
         self._requester = requester
-        self._cwd = cwd
 
     @property
     def name(self) -> str:
@@ -68,13 +65,9 @@ def init(self, force_adapting_existing_project: bool):
         else:
             self._new_project_creator.run()
 
-    def _can_be_protostar_project(self) -> bool:
-
-        files_depth_3 = (
-            glob(str(self._cwd / "*"))
-            + glob(str(self._cwd / "*" / "*"))
-            + glob(str(self._cwd / "*" / "*" / "*"))
-        )
+    @staticmethod
+    def _can_be_protostar_project() -> bool:
+        files_depth_3 = glob("*") + glob("*/*") + glob("*/*/*")
         return any(
             map(lambda f: f.endswith(".cairo") or f == ".git", files_depth_3)
-        ) and "protostar.toml" not in glob(str(self._cwd / "*"))
+        ) and "protostar.toml" not in glob("*")

protostar/composition_root.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from logging import getLogger
 from pathlib import Path
-from typing import List, Optional
+from typing import List
 
 from protostar.cli import Command
 from protostar.commands import (
@@ -55,10 +55,10 @@ class DIContainer:
 
 
 # pylint: disable=too-many-locals
-def build_di_container(script_root: Path, cwd: Optional[Path] = None):
-    cwd = cwd or Path()
+def build_di_container(script_root: Path):
     logger = getLogger()
-    protostar_toml_path = search_upwards_protostar_toml_path(start_path=cwd.resolve())
+    cwd = Path()
+    protostar_toml_path = search_upwards_protostar_toml_path(start_path=cwd)
     project_root_path = (
         protostar_toml_path.parent if protostar_toml_path is not None else cwd
     )
@@ -111,7 +111,6 @@ def build_di_container(script_root: Path, cwd: Optional[Path] = None):
                 protostar_toml_writer,
                 version_manager,
             ),
-            cwd=cwd,
         ),
         BuildCommand(project_compiler, logger),
         InstallCommand(

protostar/starknet_gateway/gateway_facade.py

@@ -18,7 +18,7 @@
 from protostar.starknet_gateway.starknet_request import StarknetRequest
 from protostar.utils.log_color_provider import LogColorProvider
 
-GatewayFacadeSupportedInputType = Union[List[int], Dict[str, Any]]
+ContractFunctionInputType = Union[List[int], Dict[str, Any]]
 
 
 class TransactionException(ProtostarException):

protostar/starknet_gateway/starknet_request.py

@@ -8,7 +8,7 @@
 
 @dataclass
 class StarknetRequest:
-    Action = Literal["DEPLOY", "DECLARE", "CALL"]
+    Action = Literal["DEPLOY", "DECLARE"]
     Payload = Dict[str, Union[None, str, int, List[int], List[str]]]
 
     action: Action

protostar/start.py

@@ -17,7 +17,7 @@
 
 
 def main(script_root: Path):
-    container = build_di_container(script_root, cwd=Path())
+    container = build_di_container(script_root)
     arg_parser = build_parser(container.protostar_cli, container.protostar_toml_reader)
     args = parse_args(arg_parser)
     run_protostar(container.protostar_cli, args, arg_parser)

scripts/generate_reference_docs_test.py

@@ -5,7 +5,7 @@
 
 
 def test_instance_matches_cli_reference_docs():
-    di_container = build_di_container(script_root=Path(), cwd=Path())
+    di_container = build_di_container(script_root=Path())
     new_snapshot = ReferenceDocsGenerator(
         di_container.protostar_cli
     ).generate_cli_reference_markdown()

tests/integration/gateway/gateway_facade_test.py

@@ -3,7 +3,6 @@
 import pytest
 
 from protostar.starknet_gateway.gateway_facade import GatewayFacade
-from protostar.utils.log_color_provider import LogColorProvider
 from tests.integration.protostar_fixture import ProtostarFixture
 
 
@@ -20,8 +19,6 @@ def compiled_contract_path_fixture(protostar: ProtostarFixture) -> Path:
 
 @pytest.fixture(name="gateway_facade")
 def gateway_facade_fixture(devnet_gateway_url: str):
-    log_color_provider = LogColorProvider()
-    log_color_provider.is_ci_mode = False
     gateway_facade_builder = GatewayFacade.Builder(project_root_path=Path())
     gateway_facade_builder.set_network(devnet_gateway_url)
     return gateway_facade_builder.build()

tests/integration/protostar_fixture.py

@@ -1,4 +1,5 @@
 import asyncio
+import os
 from argparse import Namespace
 from logging import getLogger
 from pathlib import Path
@@ -43,7 +44,11 @@ def project_root_path(self) -> Path:
     def init_sync(self):
         args = Namespace()
         args.existing = False
-        return asyncio.run(self._init_command.run(args))
+        cwd = Path().resolve()
+        os.chdir(self._project_root_path.parent)
+        result = asyncio.run(self._init_command.run(args))
+        os.chdir(cwd)
+        return result
 
     def build_sync(self):
         args = Namespace()
@@ -151,7 +156,6 @@ def request_input(message: str) -> str:
         input_requester,
         new_project_creator=new_project_creator,
         adapted_project_creator=mocker.MagicMock(),
-        cwd=project_root_path.parent,
     )
 
     project_compiler = ProjectCompiler(