fix: merge conflicts

marsfoundation · Jul 4, 2024 · 132d11b · 132d11b
1 parent 869ccdc
commit 132d11b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/test/invariant/handlers/TimeBasedRateHandler.sol b/test/invariant/handlers/TimeBasedRateHandler.sol
@@ -10,7 +10,6 @@ import { IDSROracle }    from "lib/xchain-dsr-oracle/src/interfaces/IDSROracle.s
 contract TimeBasedRateHandler is StdCheats, StdUtils {
 
     uint256 public dsr;
-    uint256 public chi;
     uint256 public rho;
 
     uint256 constant ONE_HUNDRED_PCT_APY_DSR = 1.000000021979553151239153027e27;

diff --git a/test/unit/Previews.t.sol b/test/unit/Previews.t.sol
@@ -123,7 +123,7 @@ contract PSMPreviewSwapExactOut_DaiAssetInTests is PSMTestBase {
         amountOut      = _bound(amountOut,      1,         USDC_TOKEN_MAX);
         conversionRate = _bound(conversionRate, 0.0001e27, 1000e27);  // 0.01% to 100,000% conversion rate
 
-        rateProvider.__setConversionRate(conversionRate);
+        mockRateProvider.__setConversionRate(conversionRate);
 
         uint256 amountIn = amountOut * conversionRate / 1e27;
 
@@ -189,7 +189,7 @@ contract PSMPreviewSwapExactOut_USDCAssetInTests is PSMTestBase {
         amountOut      = _bound(amountOut,     1,         SDAI_TOKEN_MAX);
         conversionRate = _bound(conversionRate, 0.0001e27, 1000e27);  // 0.01% to 100,000% conversion rate
 
-        rateProvider.__setConversionRate(conversionRate);
+        mockRateProvider.__setConversionRate(conversionRate);
 
         uint256 amountIn = amountOut * conversionRate / 1e27 / 1e12;
 
@@ -248,7 +248,7 @@ contract PSMPreviewSwapExactOut_SDaiAssetInTests is PSMTestBase {
         amountOut      = _bound(amountOut,      1,         DAI_TOKEN_MAX);
         conversionRate = _bound(conversionRate, 0.0001e27, 1000e27);  // 0.01% to 100,000% conversion rate
 
-        rateProvider.__setConversionRate(conversionRate);
+        mockRateProvider.__setConversionRate(conversionRate);
 
         uint256 amountIn = amountOut * 1e27 / conversionRate;
 
@@ -265,7 +265,7 @@ contract PSMPreviewSwapExactOut_SDaiAssetInTests is PSMTestBase {
         amountOut      = bound(amountOut,      1,         USDC_TOKEN_MAX);
         conversionRate = bound(conversionRate, 0.0001e27, 1000e27);  // 0.01% to 100,000% conversion rate
 
-        rateProvider.__setConversionRate(conversionRate);
+        mockRateProvider.__setConversionRate(conversionRate);
 
         uint256 amountIn = amountOut * 1e27 / conversionRate * 1e12;
 

diff --git a/test/unit/SwapExactOut.t.sol b/test/unit/SwapExactOut.t.sol
@@ -226,7 +226,7 @@ contract PSMSwapExactOutDaiAssetInTests is PSMSwapExactOutSuccessTestsBase {
 
         amountOut      = _bound(amountOut,      1,       DAI_TOKEN_MAX);
         conversionRate = _bound(conversionRate, 0.01e27, 100e27);  // 1% to 10,000% conversion rate
-        rateProvider.__setConversionRate(conversionRate);
+        mockRateProvider.__setConversionRate(conversionRate);
 
         uint256 amountIn = amountOut * conversionRate / 1e27;
 
@@ -280,7 +280,7 @@ contract PSMSwapExactOutUsdcAssetInTests is PSMSwapExactOutSuccessTestsBase {
         amountOut      = _bound(amountOut,      1,       SDAI_TOKEN_MAX);
         conversionRate = _bound(conversionRate, 0.01e27, 100e27);  // 1% to 10,000% conversion rate
 
-        rateProvider.__setConversionRate(conversionRate);
+        mockRateProvider.__setConversionRate(conversionRate);
 
         uint256 amountIn = amountOut * conversionRate / 1e27 / 1e12;
 
@@ -320,7 +320,7 @@ contract PSMSwapExactOutSDaiAssetInTests is PSMSwapExactOutSuccessTestsBase {
         amountOut      = _bound(amountOut,      1,       DAI_TOKEN_MAX);
         conversionRate = _bound(conversionRate, 0.01e27, 100e27);  // 1% to 10,000% conversion rate
 
-        rateProvider.__setConversionRate(conversionRate);
+        mockRateProvider.__setConversionRate(conversionRate);
 
         uint256 amountIn = amountOut * 1e27 / conversionRate;
 
@@ -340,7 +340,7 @@ contract PSMSwapExactOutSDaiAssetInTests is PSMSwapExactOutSuccessTestsBase {
         amountOut      = _bound(amountOut,      1,       USDC_TOKEN_MAX);
         conversionRate = _bound(conversionRate, 0.01e27, 100e27);  // 1% to 10,000% conversion rate
 
-        rateProvider.__setConversionRate(conversionRate);
+        mockRateProvider.__setConversionRate(conversionRate);
 
         uint256 amountIn = amountOut * 1e27 / conversionRate * 1e12;