fix: resolve tests

Author: yan-man

scripts/misc/DeployHorizonPhaseTwoPayload.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import {AaveV3EthereumHorizonCustom} from 'tests/horizon/utils/AaveV3EthereumHorizonCustom.sol';
-import {AaveV3EthereumHorizon, AaveV3EthereumHorizonAssets} from 'aave-address-book/AaveV3EthereumHorizon.sol';
+import {AaveV3HorizonEthereum} from 'tests/horizon/utils/AaveV3HorizonEthereum.sol';
 import {HorizonPhaseTwoListing} from 'src/deployments/inputs/HorizonPhaseTwoListing.sol';
 import {AaveV3HelpersBatchOne} from 'src/deployments/projects/aave-v3-batched/batches/AaveV3HelpersBatchOne.sol';
 import {AaveV3ConfigEngine} from 'src/contracts/extensions/v3-config-engine/AaveV3ConfigEngine.sol';
@@ -12,21 +11,21 @@ contract DeployHorizonPhaseTwoPayload is Script {
   function run() public returns (address, address) {
     vm.startBroadcast();
     AaveV3HelpersBatchOne helpersBatchOne = new AaveV3HelpersBatchOne(
-      address(AaveV3EthereumHorizon.POOL),
-      address(AaveV3EthereumHorizon.POOL_CONFIGURATOR),
-      address(AaveV3EthereumHorizonAssets.GHO_INTEREST_RATE_STRATEGY),
-      address(AaveV3EthereumHorizon.ORACLE),
-      address(AaveV3EthereumHorizon.DEFAULT_INCENTIVES_CONTROLLER),
-      address(AaveV3EthereumHorizon.COLLECTOR),
-      address(AaveV3EthereumHorizon.DEFAULT_A_TOKEN_IMPL),
-      address(AaveV3EthereumHorizon.DEFAULT_VARIABLE_DEBT_TOKEN_IMPL)
+      AaveV3HorizonEthereum.POOL,
+      AaveV3HorizonEthereum.POOL_CONFIGURATOR,
+      AaveV3HorizonEthereum.DEFAULT_INTEREST_RATE_STRATEGY,
+      AaveV3HorizonEthereum.AAVE_ORACLE,
+      AaveV3HorizonEthereum.REWARDS_CONTROLLER,
+      AaveV3HorizonEthereum.REVENUE_SPLITTER,
+      AaveV3HorizonEthereum.ATOKEN_IMPLEMENTATION,
+      AaveV3HorizonEthereum.VARIABLE_DEBT_TOKEN_IMPLEMENTATION
     );
 
-    address configEngine = helpersBatchOne.getConfigEngineReport().configEngine;
-
-    HorizonPhaseTwoListing horizonPhaseTwoListing = new HorizonPhaseTwoListing(configEngine);
+    HorizonPhaseTwoListing horizonPhaseTwoListing = new HorizonPhaseTwoListing(
+      helpersBatchOne.getConfigEngineReport().configEngine
+    );
     vm.stopBroadcast();
 
-    return (configEngine, address(horizonPhaseTwoListing));
+    return (address(helpersBatchOne), address(horizonPhaseTwoListing));
   }
 }

src/deployments/inputs/HorizonPhaseTwoListing.sol

@@ -5,7 +5,6 @@ import {IAaveV3ConfigEngine as IEngine} from '../../contracts/extensions/v3-conf
 import {EngineFlags} from '../../contracts/extensions/v3-config-engine/EngineFlags.sol';
 import {AaveV3Payload} from '../../contracts/extensions/v3-config-engine/AaveV3Payload.sol';
 
-import {AaveV3EthereumHorizon, AaveV3EthereumHorizonAssets} from 'aave-address-book/AaveV3EthereumHorizon.sol';
 import {AaveV3EthereumHorizonCustom} from 'tests/horizon/utils/AaveV3EthereumHorizonCustom.sol';
 
 contract HorizonPhaseTwoListing is AaveV3Payload {
@@ -65,7 +64,7 @@ contract HorizonPhaseTwoListing is AaveV3Payload {
       }),
       IEngine.TokenImplementations({
         aToken: AaveV3EthereumHorizonCustom.RWA_ATOKEN_IMPLEMENTATION,
-        vToken: AaveV3EthereumHorizon.DEFAULT_VARIABLE_DEBT_TOKEN_IMPL
+        vToken: AaveV3EthereumHorizonCustom.VARIABLE_DEBT_TOKEN_IMPLEMENTATION
       })
     );
 
@@ -85,7 +84,7 @@ contract HorizonPhaseTwoListing is AaveV3Payload {
       borrowable: EngineFlags.DISABLED
     });
     assetsEMode[index++] = IEngine.AssetEModeUpdate({
-      asset: AaveV3EthereumHorizonAssets.GHO_UNDERLYING,
+      asset: AaveV3EthereumHorizonCustom.GHO_UNDERLYING,
       eModeCategory: 1,
       collateral: EngineFlags.DISABLED,
       borrowable: EngineFlags.ENABLED

tests/deployments/HorizonBase.t.sol

@@ -27,7 +27,6 @@ import {Errors} from '../../src/contracts/protocol/libraries/helpers/Errors.sol'
 import {ProxyHelpers} from '../utils/ProxyHelpers.sol';
 import {IParameterRegistry} from '../horizon/dependencies/IParameterRegistry.sol';
 import {AaveV3EthereumHorizonCustom} from '../horizon/utils/AaveV3EthereumHorizonCustom.sol';
-import {AaveV3EthereumHorizon, AaveV3EthereumHorizonAssets} from 'aave-address-book/AaveV3EthereumHorizon.sol';
 
 abstract contract HorizonBaseTest is Test {
   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;
@@ -94,13 +93,13 @@ abstract contract HorizonBaseTest is Test {
   }
 
   function initEnvironment() internal virtual {
-    pool = IPool(address(AaveV3EthereumHorizon.POOL));
-    revenueSplitter = IRevenueSplitter(address(AaveV3EthereumHorizon.COLLECTOR));
+    pool = IPool(AaveV3EthereumHorizonCustom.POOL);
+    revenueSplitter = IRevenueSplitter(AaveV3EthereumHorizonCustom.REVENUE_SPLITTER);
     defaultInterestRateStrategy = IDefaultInterestRateStrategyV2(
-      AaveV3EthereumHorizonAssets.GHO_INTEREST_RATE_STRATEGY
+      AaveV3EthereumHorizonCustom.DEFAULT_INTEREST_RATE_STRATEGY
     );
-    aTokenImpl = AaveV3EthereumHorizon.DEFAULT_A_TOKEN_IMPL;
-    variableDebtTokenImpl = AaveV3EthereumHorizon.DEFAULT_VARIABLE_DEBT_TOKEN_IMPL;
+    aTokenImpl = AaveV3EthereumHorizonCustom.ATOKEN_IMPLEMENTATION;
+    variableDebtTokenImpl = AaveV3EthereumHorizonCustom.VARIABLE_DEBT_TOKEN_IMPLEMENTATION;
     rwaATokenImpl = AaveV3EthereumHorizonCustom.RWA_ATOKEN_IMPLEMENTATION;
   }
 

tests/deployments/HorizonPhaseTwoListing.t.sol

@@ -48,7 +48,7 @@ contract HorizonPhaseTwoListingTest is HorizonBaseTest {
       liquidationBonus: 100_00 + 3_00,
       label: 'VBILL GHO',
       collateralAssets: _toDynamicAddressArray(AaveV3EthereumHorizonCustom.VBILL_UNDERLYING),
-      borrowableAssets: _toDynamicAddressArray(AaveV3EthereumHorizonAssets.GHO_UNDERLYING)
+      borrowableAssets: _toDynamicAddressArray(AaveV3EthereumHorizonCustom.GHO_UNDERLYING)
     });
 
   uint8 internal constant VBILL_GHO_EMODE_CATEGORY = 1;
@@ -101,8 +101,8 @@ contract HorizonPhaseTwoListingTest is HorizonBaseTest {
         token: token,
         params: params,
         borrowableAssets: _toDynamicAddressArray(
-          AaveV3EthereumHorizonAssets.USDC_UNDERLYING,
-          AaveV3EthereumHorizonAssets.GHO_UNDERLYING
+          AaveV3EthereumHorizonCustom.USDC_UNDERLYING,
+          AaveV3EthereumHorizonCustom.GHO_UNDERLYING
         ),
         dealCollateral: false
       });
@@ -192,7 +192,7 @@ contract HorizonPhaseTwoListingVTestnetTest is HorizonPhaseTwoListingTest {
     vm.startPrank(user);
     IERC20(AaveV3EthereumHorizonCustom.VBILL_UNDERLYING).approve(address(pool), 100e6);
     pool.supply(AaveV3EthereumHorizonCustom.VBILL_UNDERLYING, 100e6, user, 0);
-    pool.borrow(AaveV3EthereumHorizonAssets.USDC_UNDERLYING, 50e6, 2, 0, user);
+    pool.borrow(AaveV3EthereumHorizonCustom.USDC_UNDERLYING, 50e6, 2, 0, user);
     vm.stopPrank();
   }
 }

tests/horizon/utils/AaveV3EthereumHorizonCustom.sol

@@ -41,6 +41,12 @@ library AaveV3EthereumHorizonCustom {
   address public constant VBILL_UNDERLYING = 0x2255718832bC9fD3bE1CaF75084F4803DA14FF01;
   address public constant VBILL_PRICE_FEED = 0x5ed77a9D9b7cc80E9d0D7711024AF38C2643C1c4;
 
+  address public constant GHO_UNDERLYING = 0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f;
+
+  address public constant USDC_UNDERLYING = 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48;
+
+  address public constant RLUSD_UNDERLYING = 0x8292Bb45bf1Ee4d140127049757C2E0fF06317eD;
+
   // oracle param registry
   address public constant RWA_ORACLE_PARAMS_REGISTRY = 0x69D55D504BC9556E377b340D19818E736bbB318b;
 }