Merge pull request #167 from gildlab/2024-11-04-rm-cyclo

rm cyclo and fix tests
gildlab · Nov 4, 2024 · cf07892 · cf07892
2 parents 5694106 + 81bb848
commit cf07892
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 84 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,6 +16,3 @@
 [submodule "lib/rain.tier.interface"]
 	path = lib/rain.tier.interface
 	url = https://github.com/rainlanguage/rain.tier.interface
-[submodule "lib/solady"]
-	path = lib/solady
-	url = https://github.com/Vectorized/solady
diff --git a/lib/solady b/lib/solady
diff --git a/src/concrete/receipt/CycloReceipt.sol b/src/concrete/receipt/CycloReceipt.sol
diff --git a/test/src/concrete/receipt/CycloReceipt.metadata.t.sol b/test/src/concrete/receipt/CycloReceipt.metadata.t.sol
diff --git a/test/src/concrete/vault/ERC20PriceOracleReceiptVault.deposit.t.sol b/test/src/concrete/vault/ERC20PriceOracleReceiptVault.deposit.t.sol
@@ -220,6 +220,7 @@ contract ERC20PriceOracleReceiptVaultDepositTest is ERC20PriceOracleReceiptVault
         deal(address(SFLR_CONTRACT), alice, deposit);
 
         vm.startPrank(alice);
+        vm.assume(vault.previewDeposit(deposit, 0) > 0);
 
         vault.deposit(deposit, alice, 0, hex"00");
         vm.stopPrank();

diff --git a/test/src/concrete/vault/ERC20PriceOracleReceiptVault.mint.t.sol b/test/src/concrete/vault/ERC20PriceOracleReceiptVault.mint.t.sol
@@ -16,7 +16,7 @@ import {SFLR_CONTRACT} from "rain.flare/lib/sflr/LibSceptreStakedFlare.sol";
 import {LibERC20PriceOracleReceiptVaultFork} from "../../../lib/LibERC20PriceOracleReceiptVaultFork.sol";
 import {Receipt as ReceiptContract} from "src/concrete/receipt/Receipt.sol";
 
-contract ERC20PriceOracleReceiptVaultDepositTest is ERC20PriceOracleReceiptVaultTest {
+contract ERC20PriceOracleReceiptVaultMintTest is ERC20PriceOracleReceiptVaultTest {
     using LibFixedPointDecimalArithmeticOpenZeppelin for uint256;
 
     /// Test mint function
@@ -192,6 +192,9 @@ contract ERC20PriceOracleReceiptVaultDepositTest is ERC20PriceOracleReceiptVault
         uint256 rate = LibERC20PriceOracleReceiptVaultFork.getRate();
 
         uint256 shares = amount.fixedPointMul(rate, Math.Rounding.Down);
+
+        vm.assume(vault.previewMint(shares, 0) > 0);
+
         // Execute mint
         vault.mint(shares, alice, 0, hex"00");
         vm.stopPrank();

diff --git a/test/src/concrete/vault/ERC20PriceOracleReceiptVault.redeem.t.sol b/test/src/concrete/vault/ERC20PriceOracleReceiptVault.redeem.t.sol
@@ -326,6 +326,7 @@ contract ERC20PriceOracleReceiptVaultRedeemTest is ERC20PriceOracleReceiptVaultT
 
         vm.startPrank(alice);
         uint256 rate = LibERC20PriceOracleReceiptVaultFork.getRate();
+        vm.assume(vault.previewDeposit(deposit, 0) > 0);
         vault.deposit(deposit, alice, 0, hex"00");
 
         uint256 shareBalance = vault.balanceOf(alice);

diff --git a/test/src/concrete/vault/ERC20PriceOracleReceiptVault.withdraw.t.sol b/test/src/concrete/vault/ERC20PriceOracleReceiptVault.withdraw.t.sol
@@ -312,6 +312,7 @@ contract ERC20PriceOracleReceiptVaultWithdrawTest is ERC20PriceOracleReceiptVaul
         deal(address(SFLR_CONTRACT), alice, deposit);
 
         vm.startPrank(alice);
+        vm.assume(vault.previewDeposit(deposit, 0) > 0);
         vault.deposit(deposit, alice, 0, hex"00");
 
         uint256 shareBalance = vault.balanceOf(alice);