Rename adapter_handler to adapter_builder and move responsibilities

testing/src/runner/adapter_builder.py

@@ -1,15 +1,33 @@
+import os
 import subprocess
 from typing import Optional
 
 
-class AdapterContractHandler:
-    @staticmethod
+class AdapterContractBuilder:
+    def __init__(self, src_path: str):
+        self.src_path = src_path
+
+    def find_contract(self, adapter_contract: str):
+        """
+        Finds the contract file in the provided source path.
+
+        :param adapter_contract: The contract name to be found.
+        :return: The path to the contract file.
+        """
+        contract_path = os.path.join(
+            self.src_path,
+            "out",
+            f"{adapter_contract}.sol",
+            f"{adapter_contract}.evm.runtime",
+        )
+        if not os.path.exists(contract_path):
+            raise FileNotFoundError(f"Contract {adapter_contract} not found.")
+
+        return contract_path
+
     def build_target(
-        src_path: str,
-        adapter_contract: str,
-        signature: Optional[str],
-        args: Optional[str],
-    ):
+        self, adapter_contract: str, signature: Optional[str], args: Optional[str]
+    ) -> str:
         """
         Runs the buildRuntime Bash script in a subprocess with the provided arguments.
 
@@ -17,6 +35,8 @@ class AdapterContractHandler:
         :param adapter_contract: The contract name to be passed to the script.
         :param signature: The constructor signature to be passed to the script.
         :param args: The constructor arguments to be passed to the script.
+
+        :return: The path to the contract file.
         """
 
         script_path = "scripts/buildRuntime.sh"
@@ -27,7 +47,7 @@ class AdapterContractHandler:
             # Running the bash script with the provided arguments
             result = subprocess.run(
                 [script_path, "-c", adapter_contract, "-s", signature, "-a", args],
-                cwd=src_path,
+                cwd=self.src_path,
                 capture_output=True,
                 text=True,
                 check=True,
@@ -38,6 +58,8 @@ class AdapterContractHandler:
             if result.stderr:
                 print("Errors:\n", result.stderr)
 
+            return self.find_contract(adapter_contract)
+
         except subprocess.CalledProcessError as e:
             print(f"An error occurred: {e}")
             print("Error Output:\n", e.stderr)

testing/src/runner/runner.py

@@ -33,7 +33,7 @@ from models import (
     ProtocolComponentWithTestConfig,
     ProtocolComponentExpectation,
 )
-from adapter_handler import AdapterContractHandler
+from adapter_builder import AdapterContractBuilder
 from evm import get_token_balance, get_block_header
 from tycho import TychoRunner
 from utils import build_snapshot_message, token_factory
@@ -76,7 +76,9 @@ class TestRunner:
         )
         self.config: IntegrationTestsConfig = parse_config(config_path)
         self.spkg_src = os.path.join(self.repo_root, "substreams", package)
-        self.adapters_src = os.path.join(self.repo_root, "evm")
+        self.adapter_contract_builder = AdapterContractBuilder(
+            os.path.join(self.repo_root, "evm")
+        )
         self.tycho_runner = TychoRunner(
             db_url, with_binary_logs, self.config.initialized_accounts
         )
@@ -233,18 +235,13 @@ class TestRunner:
         )
 
         failed_simulations: dict[str, list[SimulationFailure]] = dict()
-        for _ in protocol_type_names:
-            adapter_contract = os.path.join(
-                self.adapters_src,
-                "out",
-                f"{self.config.adapter_contract}.sol",
-                f"{self.config.adapter_contract}.evm.runtime",
-            )
-            if not os.path.exists(adapter_contract):
-                print("Adapter contract not found. Building it ...")
 
-                AdapterContractHandler.build_target(
-                    self.adapters_src,
+        try:
+            adapter_contract = self.adapter_contract_builder.find_contract(
+                self.config.adapter_contract
+            )
+        except FileNotFoundError:
+            adapter_contract = self.adapter_contract_builder.build_target(
                 self.config.adapter_contract,
                 self.config.adapter_build_signature,
                 self.config.adapter_build_args,
@@ -267,13 +264,9 @@ class TestRunner:
             pool_id = pool_state.id_
             if not pool_state.balances:
                 raise ValueError(f"Missing balances for pool {pool_id}")
-                for sell_token, buy_token in itertools.permutations(
-                    pool_state.tokens, 2
-                ):
+            for sell_token, buy_token in itertools.permutations(pool_state.tokens, 2):
                 # Try to sell 0.1% of the protocol balance
-                    sell_amount = (
-                        Decimal("0.001") * pool_state.balances[sell_token.address]
-                    )
+                sell_amount = Decimal("0.001") * pool_state.balances[sell_token.address]
                 try:
                     amount_out, gas_used, _ = pool_state.get_amount_out(
                         sell_token, sell_amount, buy_token