From 9930fd5298ddc677992b28360fc6eb7931ff6dcd Mon Sep 17 00:00:00 2001
From: Kirill Kuvshinov <kkirka@gmail.com>
Date: Fri, 11 Aug 2023 15:11:27 +0300
Subject: [PATCH] fixup! fix: [RFR-01][RFR-03] unify the meaning of
 minAmountToConvert

---
 contracts/RiskFund/RiskFund.sol |  4 +---
 tests/hardhat/Fork/RiskFund.ts  | 33 ++++++++++++++++++++-------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/contracts/RiskFund/RiskFund.sol b/contracts/RiskFund/RiskFund.sol
index 5605aef3a..51a411ef9 100644
--- a/contracts/RiskFund/RiskFund.sol
+++ b/contracts/RiskFund/RiskFund.sol
@@ -276,9 +276,7 @@ contract RiskFund is AccessControlledV8, ExponentialNoError, ReserveHelpers, Max
         Exp memory baseAssetPrice = Exp({ mantissa: oracle.getPrice(convertibleBaseAsset_) });
         uint256 amountOutMinInUsd = mul_ScalarTruncate(baseAssetPrice, amountOutMin);
 
-        if (amountOutMinInUsd < minAmountToConvert) {
-            return 0;
-        }
+        require(amountOutMinInUsd >= minAmountToConvert, "RiskFund: minAmountToConvert violated");
 
         assetsReserves[underlyingAsset] -= balanceOfUnderlyingAsset;
         _poolsAssetsReserves[comptroller][underlyingAsset] -= balanceOfUnderlyingAsset;
diff --git a/tests/hardhat/Fork/RiskFund.ts b/tests/hardhat/Fork/RiskFund.ts
index 035ac3412..08eacb567 100644
--- a/tests/hardhat/Fork/RiskFund.ts
+++ b/tests/hardhat/Fork/RiskFund.ts
@@ -630,19 +630,26 @@ describe("Risk Fund: Tests", function () {
       const riskFundUSDCBal = await USDC.balanceOf(riskFund.address);
       expect(riskFundUSDCBal).equal(convertToUnit(9, 18));
 
-      const amount = await riskFund.callStatic.swapPoolsAssets(
-        [vUSDT.address, vUSDC.address, vUSDT2.address, vUSDC2.address, vUSDT3.address],
-        [convertToUnit(9, 18), convertToUnit(9, 18), convertToUnit(9, 18), convertToUnit(9, 18), convertToUnit(9, 18)],
-        [
-          [USDT.address, BUSD.address],
-          [USDC.address, BUSD.address],
-          [USDT.address, BUSD.address],
-          [USDC.address, BUSD.address],
-          [USDT.address, BUSD.address],
-        ],
-        deadline,
-      );
-      expect(amount).equal("0");
+      await expect(
+        riskFund.swapPoolsAssets(
+          [vUSDT.address, vUSDC.address, vUSDT2.address, vUSDC2.address, vUSDT3.address],
+          [
+            convertToUnit(9, 18),
+            convertToUnit(9, 18),
+            convertToUnit(9, 18),
+            convertToUnit(9, 18),
+            convertToUnit(9, 18),
+          ],
+          [
+            [USDT.address, BUSD.address],
+            [USDC.address, BUSD.address],
+            [USDT.address, BUSD.address],
+            [USDC.address, BUSD.address],
+            [USDT.address, BUSD.address],
+          ],
+          deadline,
+        ),
+      ).to.be.revertedWith("RiskFund: minAmountToConvert violated");
     });
 
     it("Above min threshold amount", async function () {