feat: e2e test abstracted a bit + no need to define on/off ramps

Author: donosonaumczuk

src/20250519_Multi_GHOAvalancheLaunch/abstraction/tests/AaveV3GHOLaneTest.sol

@@ -132,13 +132,26 @@ abstract contract AaveV3GHOLaneTest is ProtocolV3TestBase {
   function _getOffRamp(uint64 chainSelector) internal view virtual returns (address) {
     IRouter.OffRamp[] memory offRamps = LOCAL_CCIP_ROUTER.getOffRamps();
     for (uint256 i = 0; i < offRamps.length; i++) {
-      if (offRamps[i].sourceChainSelector == chainSelector) {
+      if (
+        offRamps[i].sourceChainSelector == chainSelector &&
+        _hasOffRampExpectedVersion(offRamps[i].offRamp)
+      ) {
         return offRamps[i].offRamp;
       }
     }
     return address(0);
   }
 
+  function _offRampExpectedVersion() internal view virtual returns (string memory) {
+    return 'EVM2EVMOffRamp 1.5.0';
+  }
+
+  function _hasOffRampExpectedVersion(address offRamp) internal view virtual returns (bool) {
+    return
+      keccak256(bytes(IEVM2EVMOffRamp_1_5(offRamp).typeAndVersion())) ==
+      keccak256(bytes(_offRampExpectedVersion()));
+  }
+
   function setUp() public virtual {
     vm.createSelectFork(vm.rpcUrl(forkRpcAlias), FORK_BLOCK_NUMBER);
     proposal = _deployAaveV3GHOLaneProposal();

src/20250519_Multi_GHOAvalancheLaunch/abstraction/tests/AaveV3GHORemoteLaneTest.sol

@@ -239,13 +239,10 @@ abstract contract AaveV3GHORemoteLaneTest_PostExecution is AaveV3GHOLaneTest {
     uint256 amount = 100e18;
     skip(_getInboundRefillTime(amount));
 
-    vm.prank(address(_localInboundLaneFromRemote()));
-    vm.expectRevert(
-      abi.encodeWithSelector(
-        CallerIsNotARampOnRouter.selector,
-        address(_localInboundLaneFromRemote())
-      )
-    );
+    address offRamp = address(_localInboundLaneFromRemote());
+
+    vm.prank(offRamp);
+    vm.expectRevert(abi.encodeWithSelector(CallerIsNotARampOnRouter.selector, offRamp));
     LOCAL_TOKEN_POOL.releaseOrMint(
       IPool_CCIP.ReleaseOrMintInV1({
         originalSender: abi.encode(alice),

src/20250519_Multi_GHOAvalancheLaunch/tests/AaveV3Avalanche_GHOAvalancheLaunch_20250519.t.sol

@@ -6,7 +6,6 @@ import {GhoCCIPChains} from '../abstraction/constants/GhoCCIPChains.sol';
 import {AaveV3GHOLane} from '../abstraction/AaveV3GHOLane.sol';
 import {AaveV3Avalanche_GHOAvalancheLaunch_20250519} from '../AaveV3Avalanche_GHOAvalancheLaunch_20250519.sol';
 import {AaveV3GHOLaunchTest_PostExecution, AaveV3GHOLaunchTest_PreExecution} from '../abstraction/tests/AaveV3GHOLaunchTest.sol';
-import {IEVM2EVMOffRamp_1_5} from 'src/interfaces/ccip/IEVM2EVMOffRamp.sol';
 
 /**
  * command: FOUNDRY_PROFILE=test forge test --match-path=src/20250519_Multi_GHOAvalancheLaunch/tests/AaveV3Avalanche_GHOAvalancheLaunch_20250519_PreExecution.t.sol -vv
@@ -88,22 +87,6 @@ contract AaveV3Avalanche_GHOAvalanceLaunch_20250519_PostExecution is
     return chains;
   }
 
-  // Local Chain's inbound lane from Ethereum (OffRamp address)
-  function _localInboundLaneFromEth() internal view virtual override returns (IEVM2EVMOffRamp_1_5) {
-    return IEVM2EVMOffRamp_1_5(GHOAvalancheLaunch.ARB_ETH_OFF_RAMP);
-  }
-
-  // Local Chain's inbound lane from Remote Chain (OffRamp address)
-  function _localInboundLaneFromRemote()
-    internal
-    view
-    virtual
-    override
-    returns (IEVM2EVMOffRamp_1_5)
-  {
-    return IEVM2EVMOffRamp_1_5(GHOAvalancheLaunch.ARB_AVAX_OFF_RAMP);
-  }
-
   // Can be improved
   function _validateConstants() internal view virtual override {
     assertEq(LOCAL_TOKEN_ADMIN_REGISTRY.typeAndVersion(), 'TokenAdminRegistry 1.5.0');