From f7d92c299f4104f074dd547dc0609c7560c5f9a2 Mon Sep 17 00:00:00 2001
From: Ameesha Agrawal <ameeshaagrawal12@gmail.com>
Date: Wed, 16 Apr 2025 16:04:43 +0530
Subject: [PATCH 1/2] fix: remove deploy contract interface

---
 contracts/interfaces/IAppGateway.sol | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/contracts/interfaces/IAppGateway.sol b/contracts/interfaces/IAppGateway.sol
index 9bd9a649..d62d647f 100644
--- a/contracts/interfaces/IAppGateway.sol
+++ b/contracts/interfaces/IAppGateway.sol
@@ -25,9 +25,6 @@ interface IAppGateway {
     /// @notice initialize the contracts on chain
     function initialize(uint32 chainSlug_) external;
 
-    /// @notice deploy contracts to chain
-    function deployContracts(uint32 chainSlug_) external;
-
     /// @notice get the on-chain address of a contract
     function getOnChainAddress(
         bytes32 contractId_,

From c9660f327b40fc5c50845f5f8856bf3c430060c4 Mon Sep 17 00:00:00 2001
From: Ameesha Agrawal <ameeshaagrawal12@gmail.com>
Date: Wed, 16 Apr 2025 16:41:10 +0530
Subject: [PATCH 2/2] fix: tests

---
 test/DeliveryHelper.t.sol | 6 +++++-
 test/apps/Counter.t.sol   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/DeliveryHelper.t.sol b/test/DeliveryHelper.t.sol
index 09ecc39d..fec81dff 100644
--- a/test/DeliveryHelper.t.sol
+++ b/test/DeliveryHelper.t.sol
@@ -10,6 +10,10 @@ import "../contracts/interfaces/IAppGateway.sol";
 
 import "./SetupTest.t.sol";
 
+interface IAppGatewayDeployer {
+    function deployContracts(uint32 chainSlug_) external;
+}
+
 contract DeliveryHelperTest is SetupTest {
     uint256 public maxFees = 0.0001 ether;
     uint256 public bidAmount = maxFees / 100;
@@ -209,7 +213,7 @@ contract DeliveryHelperTest is SetupTest {
         bytes32[] memory contractIds_
     ) internal returns (uint40 requestCount) {
         requestCount = watcherPrecompile.nextRequestCount();
-        appGateway_.deployContracts(chainSlug_);
+        IAppGatewayDeployer(address(appGateway_)).deployContracts(chainSlug_);
 
         finalizeRequest(requestCount, new bytes[](0));
         setupGatewayAndPlugs(chainSlug_, appGateway_, contractIds_);
diff --git a/test/apps/Counter.t.sol b/test/apps/Counter.t.sol
index 22207236..6462a03f 100644
--- a/test/apps/Counter.t.sol
+++ b/test/apps/Counter.t.sol
@@ -24,7 +24,7 @@ contract CounterTest is DeliveryHelperTest {
     }
 
     function deployCounterApp(uint32 chainSlug) internal returns (uint40 requestCount) {
-        requestCount = _deploy(chainSlug, IAppGateway(counterGateway), contractIds);
+        requestCount = _deploy(chainSlug, counterGateway, contractIds);
     }
 
     function testCounterDeployment() external {