wip on tests

Author: thedavidmeister

test/abstract/OwnerFreezableOwnerFreezeUntilTest.sol

@@ -5,6 +5,7 @@ pragma solidity ^0.8.25;
 import {Test} from "forge-std/Test.sol";
 import {IOwnerFreezableV1} from "src/abstract/OwnerFreezable.sol";
 import {Math} from "openzeppelin-contracts/contracts/utils/math/Math.sol";
+import {OwnableUpgradeable as Ownable} from "openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";
 
 abstract contract OwnerFreezableOwnerFreezeUntilTest is Test {
     using Math for uint256;
@@ -64,7 +65,7 @@ abstract contract OwnerFreezableOwnerFreezeUntilTest is Test {
     }
 
     function testOwnerFreezableOnlyOwnerCanFreeze(uint256 freezeUntil) external {
-        vm.expectRevert("Ownable: caller is not the owner");
+        vm.expectRevert(abi.encodeWithSelector(Ownable.OwnableUnauthorizedAccount.selector, sBob));
         vm.prank(sBob);
         sOwnerFreezable.ownerFreezeUntil(freezeUntil);
         assertEq(sOwnerFreezable.ownerFrozenUntil(), 0);
@@ -117,7 +118,7 @@ abstract contract OwnerFreezableOwnerFreezeUntilTest is Test {
     /// Only owner can call ownerFreezeAlwaysAllowFrom.
     function testOwnerFreezableOnlyOwnerCanFreezeAlwaysAllowFrom(address from, uint256 protectUntil) external {
         vm.assume(protectUntil != 0);
-        vm.expectRevert("Ownable: caller is not the owner");
+        vm.expectRevert(abi.encodeWithSelector(Ownable.OwnableUnauthorizedAccount.selector, sBob));
         vm.prank(sBob);
         sOwnerFreezable.ownerFreezeAlwaysAllowFrom(from, protectUntil);
         assertEq(sOwnerFreezable.ownerFreezeAlwaysAllowedFrom(from), 0);
@@ -129,7 +130,7 @@ abstract contract OwnerFreezableOwnerFreezeUntilTest is Test {
 
     /// Calling ownerFreezeAlwaysAllowFrom with a zero protectUntil reverts.
     function testOwnerFreezableZeroProtectUntilReverts(address from) external {
-        vm.expectRevert(abi.encodeWithSignature("OwnerFreezeAlwaysAllowedFromZero(address)", from));
+        vm.expectRevert(abi.encodeWithSelector(IOwnerFreezableV1.OwnerFreezeAlwaysAllowedFromZero.selector, from));
         vm.prank(sAlice);
         sOwnerFreezable.ownerFreezeAlwaysAllowFrom(from, 0);
     }
@@ -215,15 +216,15 @@ abstract contract OwnerFreezableOwnerFreezeUntilTest is Test {
         vm.warp(time);
         vm.prank(sAlice);
         vm.expectRevert(
-            abi.encodeWithSignature("OwnerFreezeAlwaysAllowedFromProtected(address,uint256)", from, protectUntil)
+            abi.encodeWithSelector(IOwnerFreezableV1.OwnerFreezeAlwaysAllowedFromProtected.selector, from, protectUntil)
         );
         sOwnerFreezable.ownerFreezeStopAlwaysAllowingFrom(from);
     }
 
     /// Only owner can call ownerFreezeAlwaysAllowTo.
     function testOwnerFreezableOnlyOwnerCanFreezeAlwaysAllowTo(address to, uint256 protectUntil) external {
         vm.assume(protectUntil != 0);
-        vm.expectRevert("Ownable: caller is not the owner");
+        vm.expectRevert(abi.encodeWithSelector(Ownable.OwnableUnauthorizedAccount.selector, sBob));
         vm.prank(sBob);
         sOwnerFreezable.ownerFreezeAlwaysAllowTo(to, protectUntil);
         assertEq(sOwnerFreezable.ownerFreezeAlwaysAllowedTo(to), 0);
@@ -235,7 +236,7 @@ abstract contract OwnerFreezableOwnerFreezeUntilTest is Test {
 
     /// Calling ownerFreezeAlwaysAllowTo with a zero protectUntil reverts.
     function testOwnerFreezableZeroProtectUntilRevertsTo(address to) external {
-        vm.expectRevert(abi.encodeWithSignature("OwnerFreezeAlwaysAllowedToZero(address)", to));
+        vm.expectRevert(abi.encodeWithSelector(IOwnerFreezableV1.OwnerFreezeAlwaysAllowedToZero.selector, to));
         vm.prank(sAlice);
         sOwnerFreezable.ownerFreezeAlwaysAllowTo(to, 0);
     }
@@ -318,7 +319,7 @@ abstract contract OwnerFreezableOwnerFreezeUntilTest is Test {
         vm.warp(time);
         vm.prank(sAlice);
         vm.expectRevert(
-            abi.encodeWithSignature("OwnerFreezeAlwaysAllowedToProtected(address,uint256)", to, protectUntil)
+            abi.encodeWithSelector(IOwnerFreezableV1.OwnerFreezeAlwaysAllowedToProtected.selector, to, protectUntil)
         );
         sOwnerFreezable.ownerFreezeStopAlwaysAllowingTo(to);
     }

test/src/concrete/vault/OffchainAssetReceiptVault.multicall.t.sol

@@ -6,6 +6,7 @@ import {OffchainAssetReceiptVault, DEPOSIT, WITHDRAW} from "src/concrete/vault/O
 import {OffchainAssetReceiptVaultTest} from "test/abstract/OffchainAssetReceiptVaultTest.sol";
 import {LibUniqueAddressesGenerator} from "../../../lib/LibUniqueAddressesGenerator.sol";
 import {OffchainAssetReceiptVaultAuthorizerV1} from "src/concrete/authorize/OffchainAssetReceiptVaultAuthorizerV1.sol";
+import {IReceiptVaultV1} from "src/interface/IReceiptVaultV3.sol";
 
 contract MulticallTest is OffchainAssetReceiptVaultTest {
     /// Test Mint multicall
@@ -40,11 +41,11 @@ contract MulticallTest is OffchainAssetReceiptVaultTest {
         uint256 initialBalanceOwner = vault.balanceOf(bob);
         bytes[] memory data = new bytes[](2);
 
-        data[0] = abi.encodeWithSignature(
-            "mint(uint256,address,uint256,bytes)", firstMintAmount, bob, minShareRatio, receiptInformation
+        data[0] = abi.encodeWithSelector(
+            IReceiptVaultV1.mint.selector, firstMintAmount, bob, minShareRatio, receiptInformation
         );
-        data[1] = abi.encodeWithSignature(
-            "mint(uint256,address,uint256,bytes)", secondMintAmount, bob, minShareRatio, receiptInformation
+        data[1] = abi.encodeWithSelector(
+            IReceiptVaultV1.mint.selector, secondMintAmount, bob, minShareRatio, receiptInformation
         );
 
         uint256 totalMint = firstMintAmount + secondMintAmount;
@@ -89,11 +90,11 @@ contract MulticallTest is OffchainAssetReceiptVaultTest {
         uint256 initialBalanceOwner = vault.balanceOf(bob);
         bytes[] memory data = new bytes[](2);
 
-        data[0] = abi.encodeWithSignature(
-            "deposit(uint256,address,uint256,bytes)", firstDepositAmount, bob, minShareRatio, receiptInformation
+        data[0] = abi.encodeWithSelector(
+            IReceiptVaultV1.deposit.selector, firstDepositAmount, bob, minShareRatio, receiptInformation
         );
-        data[1] = abi.encodeWithSignature(
-            "deposit(uint256,address,uint256,bytes)", secondDepositAmount, bob, minShareRatio, receiptInformation
+        data[1] = abi.encodeWithSelector(
+            IReceiptVaultV1.deposit.selector, secondDepositAmount, bob, minShareRatio, receiptInformation
         );
 
         uint256 totalMint = firstDepositAmount + secondDepositAmount;
@@ -153,12 +154,8 @@ contract MulticallTest is OffchainAssetReceiptVaultTest {
 
         bytes[] memory data = new bytes[](2);
 
-        data[0] = abi.encodeWithSignature(
-            "redeem(uint256,address,address,uint256,bytes)", firstDepositAmount, bob, bob, 1, ""
-        );
-        data[1] = abi.encodeWithSignature(
-            "redeem(uint256,address,address,uint256,bytes)", secondDepositAmount, bob, bob, 2, ""
-        );
+        data[0] = abi.encodeWithSelector(IReceiptVaultV1.redeem.selector, firstDepositAmount, bob, bob, 1, "");
+        data[1] = abi.encodeWithSelector(IReceiptVaultV1.redeem.selector, secondDepositAmount, bob, bob, 2, "");
 
         uint256 totalRedeemed = firstDepositAmount + secondDepositAmount;
         // Call multicall on redeem function
@@ -217,12 +214,8 @@ contract MulticallTest is OffchainAssetReceiptVaultTest {
 
         bytes[] memory data = new bytes[](2);
 
-        data[0] = abi.encodeWithSignature(
-            "withdraw(uint256,address,address,uint256,bytes)", firstDepositAmount, bob, bob, 1, ""
-        );
-        data[1] = abi.encodeWithSignature(
-            "withdraw(uint256,address,address,uint256,bytes)", secondDepositAmount, bob, bob, 2, ""
-        );
+        data[0] = abi.encodeWithSelector(IReceiptVaultV1.withdraw.selector, firstDepositAmount, bob, bob, 1, "");
+        data[1] = abi.encodeWithSelector(IReceiptVaultV1.withdraw.selector, secondDepositAmount, bob, bob, 2, "");
 
         uint256 totalRedeemed = firstDepositAmount + secondDepositAmount;
         // Call multicall on redeem function

test/src/concrete/vault/OffchainAssetReceiptVault.redeem.t.sol

@@ -12,6 +12,7 @@ import {
 import {IReceiptVaultV1} from "src/interface/IReceiptVaultV3.sol";
 import {LibUniqueAddressesGenerator} from "../../../lib/LibUniqueAddressesGenerator.sol";
 import {OffchainAssetReceiptVaultAuthorizerV1} from "src/concrete/authorize/OffchainAssetReceiptVaultAuthorizerV1.sol";
+import {IERC20Errors} from "openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
 
 contract RedeemTest is OffchainAssetReceiptVaultTest {
     using LibFixedPointDecimalArithmeticOpenZeppelin for uint256;
@@ -585,7 +586,9 @@ contract RedeemTest is OffchainAssetReceiptVaultTest {
 
         // Bob has no allowance so he cannot withdraw.
         vm.startPrank(bob);
-        vm.expectRevert("ERC20: insufficient allowance");
+        vm.expectRevert(
+            abi.encodeWithSelector(IERC20Errors.ERC20InsufficientAllowance.selector, bob, 0, redeemSharesAmount)
+        );
         uint256 assets = vault.redeem(redeemSharesAmount, bob, alice, 1, bytes(""));
         assertEqUint(assets, 0);
         vm.stopPrank();