merge test into unit.t.sol using proxyUpgrade, remove fallbackOracle

test/ATokenStaker/WombatStaker/ATokenWombatStakerBaseTest.t.sol

@@ -9,7 +9,6 @@ import {IAaveOracle} from '../../../src/core/interfaces/IAaveOracle.sol';
 import {IAaveIncentivesController} from '../../../src/core/interfaces/IAaveIncentivesController.sol';
 import {IMasterWombat} from '../../../src/core/interfaces/IMasterWombat.sol';
 import {AToken} from "../../../src/core/protocol/tokenization/AToken.sol";
-import {GenericLPFallbackOracle} from "../../../src/core/misc/wombatOracle/GenericLPFallbackOracle.sol";
 import {SmartHayPoolOracle} from "../../../src/core/misc/wombatOracle/SmartHayPoolOracle.sol";
 import {ATokenWombatStaker} from "../../../src/core/protocol/tokenization/ATokenWombatStaker.sol";
 import {ZeroReserveInterestRateStrategy} from "../../../src/core/misc/ZeroReserveInterestRateStrategy.sol";
@@ -33,12 +32,10 @@ contract ATokenWombatStakerBaseTest is BaseTest {
     uint16 internal liquidationBonus = 10100;
     // each eMode category may or may not have a custom oracle to override the individual assets price oracles
     // use HAY oracle for now
-    address internal EmodeOracle;
+    address internal LpOracle;
     string internal label = "wombat LP Emode";
     function setUp() public virtual override(BaseTest) {
         BaseTest.setUp();
-        //setup oracle 
-        setUpOracleThroughFallback();
         // deploy reserve, get ATokenProxy
         address aTokenProxy = deployReserveForATokenStaker();
         ATokenProxyStaker = ATokenWombatStaker(aTokenProxy);
@@ -52,7 +49,7 @@ contract ATokenWombatStakerBaseTest is BaseTest {
         emissionAdmin = new EmissionAdminAndDirectTransferStrategy(pool, emissionManager);
         ATokenProxyStaker.updateEmissionAdmin(address(emissionAdmin));
         // add emode, setup oracle specific to the emode
-        EmodeOracle = address(new SmartHayPoolOracle(
+        LpOracle = address(new SmartHayPoolOracle(
             USDC_AGGREGATOR, USDT_AGGREGATOR, HAY_AGGREGATOR, USDC, USDT, HAY 
         ));
         setUpEmodeAndOracle();
@@ -118,9 +115,9 @@ contract ATokenWombatStakerBaseTest is BaseTest {
         ReservesSetupHelper.ConfigureReserveInput[] memory inputs = new ReservesSetupHelper.ConfigureReserveInput[](1);
         inputs[0] = ReservesSetupHelper.ConfigureReserveInput(
                 underlying,
-                100, // baseLTV
-                100, // liquidationThreshold
-                10100, // liquidationBonus
+                0, // baseLTV
+                0, // liquidationThreshold
+                0, // liquidationBonus
                 1500, // reserveFactor
                 1, //borrowCap
                 2000000, //supplyCap
@@ -133,24 +130,25 @@ contract ATokenWombatStakerBaseTest is BaseTest {
         aclManager.removePoolAdmin(address(helper));
     }
 
-    function setUpOracleThroughFallback() internal {
-        GenericLPFallbackOracle LPFallbackOracle = new GenericLPFallbackOracle();
-        vm.startPrank(POOL_ADMIN);
-        IAaveOracle(oracle).setFallbackOracle(address(LPFallbackOracle));
-    }
+    // function setUpOracleThroughFallback() internal {
+    //     GenericLPFallbackOracle LPFallbackOracle = new GenericLPFallbackOracle();
+    //     vm.startPrank(POOL_ADMIN);
+    //     IAaveOracle(oracle).setFallbackOracle(address(LPFallbackOracle));
+    // }
 
     function setUpEmodeAndOracle() internal {
-
-
         vm.startPrank(POOL_ADMIN);
         configurator.setEModeCategory(eModeCategoryId, ltv, liquidationThreshold, liquidationBonus, address(0), label);
         // then set oracle
         address[] memory assets = new address[](1);
         address[] memory sources = new address[](1);
 
         assets[0] = underlying;
-        sources[0] = EmodeOracle;
+        sources[0] = LpOracle;
         IAaveOracle(oracle).setAssetSources(assets, sources);
+        uint256[] memory price = new uint256[](1);
+        price = IAaveOracle(oracle).getAssetsPrices(assets);
+        assertGt(price[0], 0);
     }
 
     function addAssetIntoEmode() internal {

test/ATokenStaker/WombatStaker/unit.t.sol

@@ -1,14 +1,56 @@
 
 import {ATokenWombatStakerBaseTest} from "./ATokenWombatStakerBaseTest.t.sol";
 import {IERC20} from "../../../src/core/dependencies/openzeppelin/contracts/IERC20.sol";
-import {ADDRESSES_PROVIDER, POOLDATA_PROVIDER, ACL_MANAGER, POOL, POOL_CONFIGURATOR, EMISSION_MANAGER, 
+import {ValidationLogic} from "../../../src/core/protocol/libraries/logic/ValidationLogic.sol";
+import {IPoolAddressesProvider} from "../../../src/core/interfaces/IPoolAddressesProvider.sol";
+import {Pool} from "../../../src/core/protocol/pool/Pool.sol";
+
+import {TIMELOCK, ADDRESSES_PROVIDER, POOLDATA_PROVIDER, ACL_MANAGER, POOL, POOL_CONFIGURATOR, EMISSION_MANAGER, 
         ATOKENIMPL, SDTOKENIMPL, VDTOKENIMPL, TREASURY, POOL_ADMIN, HAY_AGGREGATOR, HAY, 
-        MASTER_WOMBAT, SMART_HAY_LP, LIQUIDATION_ADAPTOR} from "test/utils/Addresses.sol";
+        MASTER_WOMBAT, SMART_HAY_LP, LIQUIDATION_ADAPTOR, BORROWABLE_DATA_PROVIDER} from "test/utils/Addresses.sol";
 
-contract unitTest is ATokenWombatStakerBaseTest {
+// @dev disable linked lib in foundry.toml, since forge test would inherit those setting
+// https://book.getfoundry.sh/reference/forge/forge-build?highlight=link#linker-options
+contract poolUpgradeUnitTest is ATokenWombatStakerBaseTest {
 
     function setUp() public virtual override(ATokenWombatStakerBaseTest) {
         ATokenWombatStakerBaseTest.setUp();
+        // deploy new pool impl with new validationLogic
+
+        Pool poolV2 = new Pool(IPoolAddressesProvider(ADDRESSES_PROVIDER));
+        poolV2.initialize(IPoolAddressesProvider(ADDRESSES_PROVIDER));
+        // upgrade
+        vm.startPrank(TIMELOCK);
+        provider.setPoolImpl(address(poolV2));
+        assertEq(Pool(address(pool)).POOL_REVISION(), 0x2);
+    }
+
+    function test_enableCollateralWithZeroLTV() public {
+        setReserveAsZeroLTV();
+        address bob = address(1);
+        turnOnEmode(bob);
+        deposit(bob, 1e18, underlying);
+        turnOnCollateral(bob, underlying);
+    }
+
+    function test_liquidateRevertOutsideEmodeAfterProxyUpgrade() public {
+        setReserveAsZeroLTV();
+        address bob = address(1);
+        uint256 collateralAmount = 100 * 1e18;
+        deposit(bob, collateralAmount, underlying);
+        turnOnCollateral(bob, underlying);
+        // now setup a bad debt
+        prepUSDC(bob, 1e18);
+        address debtAsset = HAY;
+        borrow(bob, 6e17, debtAsset);
+        // pass 100y
+        vm.warp(36500 days);
+        // verify health factor < 1;
+        (,,,,, uint256 healthFactor) = pool.getUserAccountData(bob);
+        assertLt(healthFactor, 1e18);
+        // attempt to liquidate half of original debt
+        liquidateRevertWith46(bob, debtAsset, underlying, 3e17);
+
     }
 
     function test_deposit() public {
@@ -51,20 +93,6 @@ contract unitTest is ATokenWombatStakerBaseTest {
         borrowExpectFail(bob, borrow_amount, underlying, 'ATokenStaker does not allow flashloan or borrow');
     }
 
-    function test_borrowWhenBorrowEnabledNonZeroPrice() public {
-        address bob = address(1);
-        uint256 collateralAmount = 100_000 * 1e18;
-        uint256 borrow_amount = 100 * 1e18;
-        // have a deposit first, so there is reserve available
-        deposit(bob, borrow_amount, underlying);
-        prepUSDC(bob, collateralAmount);
-        turnOnBorrow();
-        // this is a set-up to test the error, in mainnet we wont set price for LP
-        setUpOracle(HAY_AGGREGATOR, underlying);
-        //when borrow is enabled, price is non-zero borrow is reverted by AToken
-        borrowExpectFail(bob, borrow_amount, underlying, 'ATokenStaker does not allow flashloan or borrow');
-    }
-
 
     function test_flashloanWhenDisabled() public {
         address bob = address(1);
@@ -179,9 +207,16 @@ contract unitTest is ATokenWombatStakerBaseTest {
         // borrow
         uint256 borrowAmount = 100;
         // borrow(bob, borrowAmount, HAY);
-        borrowExpectFail(bob, borrowAmount, HAY, '34');
+        borrowExpectFail(bob, borrowAmount, HAY, '');
     }
-
+     function test_borrowWithEmode() public {
+        address bob = address(1);
+        uint256 collateralAmount = 100 * 1e18;
+        deposit(bob, collateralAmount, underlying);
+        turnOnEmode(bob);
+        turnOnCollateral(bob, underlying);
+
+     }
     function test_borrowWithEmode() public {
         address bob = address(1);
         uint256 collateralAmount = 100 * 1e18;
@@ -245,5 +280,6 @@ contract unitTest is ATokenWombatStakerBaseTest {
         toggleEmergency();
         withdraw(bob, collateralAmount, underlying);
     }
+
 
 }