chore: merge conflict fixes

algorandfoundation · Nov 27, 2023 · 840e9dc · 840e9dc
1 parent a294cf5
commit 840e9dc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/src/algokit_utils/_debug_utils.py b/src/algokit_utils/_debug_utils.py
@@ -127,7 +127,7 @@ def _write_to_file(path: Path, content: str) -> None:
     path.write_text(content)
 
 
-def _build_avm_sourcemap(
+def _build_avm_sourcemap(  # noqa: PLR0913
     *,
     teal_content: str,
     app_name: str,
@@ -208,7 +208,7 @@ def simulate_response(atc: AtomicTransactionComposer, algod_client: "AlgodClient
 
 
 def simulate_and_persist_response(
-    atc: AtomicTransactionComposer, project_root: Path, algod_client: "AlgodClient", buffer_size_mb: int | float = 256
+    atc: AtomicTransactionComposer, project_root: Path, algod_client: "AlgodClient", buffer_size_mb: float = 256
 ) -> None:
     """
     Simulates the atomic transactions using the provided `AtomicTransactionComposer` object and `AlgodClient` object,
@@ -221,7 +221,6 @@ def simulate_and_persist_response(
     :param buffer_size_mb: The size of the trace buffer in megabytes. Defaults to 256mb.
     :return: None
     """
-
     atc_to_simulate = atc.clone()
     sp = algod_client.suggested_params()
 

diff --git a/src/algokit_utils/config.py b/src/algokit_utils/config.py
@@ -63,13 +63,13 @@ def with_debug(self, func: Callable[[], str | None]) -> None:
         finally:
             self._debug = original_debug
 
-    def configure(
+    def configure(  # noqa: PLR0913
         self,
         *,
         debug: bool,
         project_root: Path | None = None,
         trace_all: bool = False,
-        trace_buffer_size_mb: int | float = 256,
+        trace_buffer_size_mb: float = 256,
         max_search_depth: int = 10,
     ) -> None:
         """
@@ -85,7 +85,7 @@ def configure(
             project_root (Path | None, optional): The path to the project root directory. Defaults to None.
             trace_all (bool, optional): Indicates whether to trace all operations. Defaults to False. Which implies that
                 only the operations that are failed will be traced by default.
-            trace_buffer_size_mb (int, optional): The size of the trace buffer in megabytes. Defaults to 512mb.
+            trace_buffer_size_mb (float, optional): The size of the trace buffer in megabytes. Defaults to 512mb.
             max_search_depth (int, optional): The maximum depth to search for a specific file. Defaults to 10.
 
         Returns: