fix tests

concero · Nov 11, 2024 · a01114c · a01114c
1 parent 37d66c9
commit a01114c
Show file tree

Hide file tree

Showing 11 changed files with 3,180 additions and 276 deletions.
diff --git a/packages/foundry/test/Bridge/StartBridge.t.sol b/packages/foundry/test/Bridge/StartBridge.t.sol
@@ -2,15 +2,15 @@
 
 pragma solidity 0.8.20;
 
-import {BaseTest, console, Vm} from "../BaseTest.t.sol";
+import {BaseTest, console, Vm} from "../utils/BaseTest.t.sol";
 import {ConceroBridge} from "contracts/ConceroBridge.sol";
 import {IInfraStorage} from "contracts/Interfaces/IInfraStorage.sol";
-import {TransparentUpgradeableProxy, ITransparentUpgradeableProxy} from "contracts/transparentProxy/TransparentUpgradeableProxy.sol";
+import {TransparentUpgradeableProxy, ITransparentUpgradeableProxy} from "contracts/Proxy/TransparentUpgradeableProxy.sol";
 import {IDexSwap} from "contracts/Interfaces/IDexSwap.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {Client} from "@chainlink/contracts-ccip/src/v0.8/ccip/libraries/Client.sol";
 import {Internal} from "@chainlink/contracts-ccip/src/v0.8/ccip/libraries/Internal.sol";
-import {OrchestratorWrapper} from "./wrappers/OrchestratorWrapper.sol";
+import {InfraOrchestratorWrapper} from "./wrappers/InfraOrchestratorWrapper.sol";
 
 contract StartBridgeTest is BaseTest {
     /*//////////////////////////////////////////////////////////////
@@ -48,7 +48,7 @@ contract StartBridgeTest is BaseTest {
         deployPoolsInfra();
 
         vm.prank(deployer);
-        baseOrchestratorImplementation = new OrchestratorWrapper(
+        baseOrchestratorImplementation = new InfraOrchestratorWrapper(
             vm.envAddress("CLF_ROUTER_BASE"),
             vm.envAddress("CONCERO_DEX_SWAP_BASE"),
             address(baseBridgeImplementation),
@@ -68,7 +68,7 @@ contract StartBridgeTest is BaseTest {
         _setDstSelectorAndPool(avalancheChainSelector, avalancheChildProxy);
         _setDstSelectorAndBridge(avalancheChainSelector, avalancheOrchestratorProxy);
 
-        deal(link, address(baseOrchestratorProxy), CCIP_FEES);
+        deal(link, address(baseOrchestratorProxy), LINK_INIT_BALANCE);
 
         users.push(user1);
         users.push(user2);
@@ -162,7 +162,7 @@ contract StartBridgeTest is BaseTest {
                 address(baseBridgeImplementation)
             )
         );
-        baseBridgeImplementation.startBridge(bridgeData, dstSwapData);
+        baseBridgeImplementation.bridge(bridgeData, dstSwapData);
     }
 
     function _startBridge(address _caller, uint256 _amount, uint64 _dstChainSelector) internal {

diff --git a/...t/Bridge/wrappers/OrchestratorWrapper.sol → ...dge/wrappers/InfraOrchestratorWrapper.sol b/...t/Bridge/wrappers/OrchestratorWrapper.sol → ...dge/wrappers/InfraOrchestratorWrapper.sol
@@ -2,9 +2,9 @@
 
 pragma solidity 0.8.20;
 
-import {Orchestrator} from "contracts/Orchestrator.sol";
+import {InfraOrchestrator} from "contracts/InfraOrchestrator.sol";
 
-contract OrchestratorWrapper is Orchestrator {
+contract InfraOrchestratorWrapper is InfraOrchestrator {
     /*//////////////////////////////////////////////////////////////
                               CONSTRUCTOR
     //////////////////////////////////////////////////////////////*/
@@ -16,7 +16,17 @@ contract OrchestratorWrapper is Orchestrator {
         address _proxy,
         uint8 _chainIndex,
         address[3] memory _messengers
-    ) Orchestrator(_functionsRouter, _dexSwap, _concero, _pool, _proxy, _chainIndex, _messengers) {}
+    )
+        InfraOrchestrator(
+            _functionsRouter,
+            _dexSwap,
+            _concero,
+            _pool,
+            _proxy,
+            _chainIndex,
+            _messengers
+        )
+    {}
 
     /*//////////////////////////////////////////////////////////////
                                  SETTER
@@ -53,7 +63,7 @@ contract OrchestratorWrapper is Orchestrator {
     function getFunctionsFeeInUsdcDelegateCall(
         uint64 _dstChainSelector
     ) external returns (uint256) {
-        (bool success, bytes memory returnData) = i_concero.delegatecall(
+        (bool success, bytes memory returnData) = i_conceroBridge.delegatecall(
             abi.encodeWithSelector(
                 bytes4(keccak256("getFunctionsFeeInUsdc(uint64)")),
                 _dstChainSelector
@@ -65,7 +75,7 @@ contract OrchestratorWrapper is Orchestrator {
     }
 
     function getCcipFeeInUsdcDelegateCall(uint64 _dstChainSelector) external returns (uint256) {
-        (bool success, bytes memory returnData) = i_concero.delegatecall(
+        (bool success, bytes memory returnData) = i_conceroBridge.delegatecall(
             abi.encodeWithSignature("getCCIPFeeInUsdc(uint64)", _dstChainSelector)
         );
         require(success, "getCCIPFeeInUsdc delegate call failed");
@@ -77,7 +87,7 @@ contract OrchestratorWrapper is Orchestrator {
         uint64 _dstChainSelector,
         uint256 _amount
     ) external returns (uint256) {
-        (bool success, bytes memory returnData) = i_concero.delegatecall(
+        (bool success, bytes memory returnData) = i_conceroBridge.delegatecall(
             abi.encodeWithSelector(
                 bytes4(keccak256("getSrcTotalFeeInUSDC(uint64,uint256)")),
                 _dstChainSelector,