Merge branch 'upgrade-lens-0' of github.com:morpho-labs/morpho-contra…

…cts into fix/litteral-formatting
morpho-org · Dec 1, 2022 · 83bfc7b · 83bfc7b
2 parents 3adb024 + 58023f6
commit 83bfc7b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/.github/workflows/ci-foundry-aave-v2-upgrade.yml b/.github/workflows/ci-foundry-aave-v2-upgrade.yml
@@ -5,15 +5,12 @@ on:
     branches:
       - main
   pull_request:
-    # branches:
-    #   - main # disabled for testing
     paths:
       - "lib/**"
       - "config/**/aave-v2/**"
       - "contracts/common/**"
       - "contracts/aave-v2/**"
-      - "test-foundry/common/**"
-      - "test-foundry/aave-v2/**"
+      - "test-foundry/prod/aave-v2/**"
       - "*.lock"
       - "Makefile"
       - "foundry.toml"

diff --git a/.github/workflows/ci-foundry-compound-upgrade.yml b/.github/workflows/ci-foundry-compound-upgrade.yml
@@ -5,15 +5,12 @@ on:
     branches:
       - main
   pull_request:
-    # branches:
-    #   - main # disabled for testing
     paths:
       - "lib/**"
       - "config/**/compound/**"
       - "contracts/common/**"
       - "contracts/compound/**"
-      - "test-foundry/common/**"
-      - "test-foundry/compound/**"
+      - "test-foundry/prod/compound/**"
       - "*.lock"
       - "Makefile"
       - "foundry.toml"

diff --git a/test-foundry/prod/aave-v2/TestUpgradeLens.t.sol b/test-foundry/prod/aave-v2/TestUpgradeLens.t.sol
@@ -48,7 +48,7 @@ contract TestUpgradeLens is TestSetup {
             assertApproxEqAbs(
                 expectedIndexes[marketIndex].p2pBorrowIndex,
                 p2pBorrowIndex,
-                1e7,
+                3e8,
                 string.concat(market.symbol, " p2p borrow index")
             );
             assertApproxEqAbs(

diff --git a/test-foundry/prod/compound/TestUpgradeLens.t.sol b/test-foundry/prod/compound/TestUpgradeLens.t.sol
@@ -105,13 +105,13 @@ contract TestUpgradeLens is TestSetup {
             assertApproxEqAbs(
                 expectedIndexes[marketIndex].poolSupplyIndex,
                 poolSupplyIndex,
-                3e8,
+                1,
                 string.concat(market.symbol, " pool supply index")
             );
             assertApproxEqAbs(
                 expectedIndexes[marketIndex].poolBorrowIndex,
                 poolBorrowIndex,
-                3e8,
+                1,
                 string.concat(market.symbol, " pool borrow index")
             );
         }