Merge pull request #1415 from morpho-dao/fix/tests-aave-v2

Fix tests aave v2

.github/workflows/ci-storage-check-aave-v2.yml

@@ -41,8 +41,3 @@ jobs:
         uses: Rubilmax/foundry-storage-check@v2.1
         with:
           contract: contracts/aave-v2/Morpho.sol:Morpho
-
-      - name: Check RewardsManager storage layout
-        uses: Rubilmax/foundry-storage-check@v2.1
-        with:
-          contract: contracts/aave-v2/RewardsManager.sol:RewardsManager

Makefile

@@ -21,7 +21,7 @@ else
 
   ifeq (${NETWORK}, eth-mainnet)
     FOUNDRY_CHAIN_ID=1
-    FOUNDRY_FORK_BLOCK_NUMBER?=14292587
+    FOUNDRY_FORK_BLOCK_NUMBER?=15581371 # Block number when the Aave's V2 IRM was updated for the stETH.
   endif
 
   ifeq (${NETWORK}, eth-ropsten)
@@ -98,11 +98,6 @@ lcov-html:
 	@echo Transforming the lcov coverage report into html
 	@genhtml lcov.info -o coverage
 
-fuzz:
-	$(eval FOUNDRY_TEST=test-foundry/fuzzing/${PROTOCOL}/)
-	@echo Running all Morpho-${PROTOCOL} fuzzing tests on "${NETWORK}" at block "${FOUNDRY_FORK_BLOCK_NUMBER}" with seed "${FOUNDRY_FUZZ_SEED}"
-	@forge test -vv
-
 gas-report:
 	@echo Creating gas report for Morpho-${PROTOCOL} on "${NETWORK}" at block "${FOUNDRY_FORK_BLOCK_NUMBER}" with seed "${FOUNDRY_FUZZ_SEED}"
 	@forge test --gas-report
@@ -120,10 +115,10 @@ single-% s-%:
 	@forge test -vvvv --match-test $* | tee trace.ansi
 
 storage-layout-generate:
-	@./scripts/storage-layout.sh generate snapshots/.storage-layout-${PROTOCOL} Morpho RewardsManager Lens
+	@./scripts/storage-layout.sh generate snapshots/.storage-layout-${PROTOCOL} Morpho Lens
 
 storage-layout-check:
-	@./scripts/storage-layout.sh check snapshots/.storage-layout-${PROTOCOL} Morpho RewardsManager Lens
+	@./scripts/storage-layout.sh check snapshots/.storage-layout-${PROTOCOL} Morpho Lens
 
 config:
 	@forge config

config/eth-mainnet/aave-v2/Config.sol

@@ -9,7 +9,6 @@ import {IIncentivesVault} from "@contracts/aave-v2/interfaces/IIncentivesVault.s
 import {IEntryPositionsManager} from "@contracts/aave-v2/interfaces/IEntryPositionsManager.sol";
 import {IExitPositionsManager} from "@contracts/aave-v2/interfaces/IExitPositionsManager.sol";
 import {IInterestRatesManager} from "@contracts/aave-v2/interfaces/IInterestRatesManager.sol";
-import {IRewardsManager} from "@contracts/aave-v2/interfaces/IRewardsManager.sol";
 
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
@@ -54,15 +53,12 @@ contract Config is BaseConfig {
         TransparentUpgradeableProxy(payable(0x507fA343d0A90786d86C7cd885f5C49263A91FF4));
     TransparentUpgradeableProxy public morphoProxy =
         TransparentUpgradeableProxy(payable(0x777777c9898D384F785Ee44Acfe945efDFf5f3E0));
-    TransparentUpgradeableProxy public rewardsManagerProxy;
 
     Lens public lensImplV1;
     Morpho public morphoImplV1;
-    IRewardsManager public rewardsManagerImplV1;
 
     Lens public lens;
     Morpho public morpho;
-    IRewardsManager public rewardsManager;
     IIncentivesVault public incentivesVault;
     IEntryPositionsManager public entryPositionsManager;
     IExitPositionsManager public exitPositionsManager;