no empty expectRevert

Author: godzillaba

test-foundry/libraries/vault/mutation/MasterVaultInit.t.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 import {MasterVaultCoreTest} from "../MasterVaultCore.t.sol";
 import {MasterVault} from "../../../../contracts/tokenbridge/libraries/vault/MasterVault.sol";
 import {TestERC20} from "../../../../contracts/tokenbridge/test/TestERC20.sol";
+import {stdError} from "forge-std/StdError.sol";
 import {IAccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/IAccessControlUpgradeable.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
@@ -38,13 +39,13 @@ contract MasterVaultInitTest is MasterVaultCoreTest {
 
     function test_initialize_revertsOnRevertingDecimals() public {
         address badToken = address(new RevertingDecimalsToken());
-        vm.expectRevert();
+        vm.expectRevert("no decimals");
         factory.deployVault(badToken);
     }
 
     function test_initialize_revertsOnOverflowDecimals() public {
         address badToken = address(new OverflowDecimalsToken());
-        vm.expectRevert();
+        vm.expectRevert(stdError.arithmeticError);
         factory.deployVault(badToken);
     }
 

test-foundry/libraries/vault/mutation/MasterVaultRebalance.t.sol

@@ -72,7 +72,9 @@ contract MasterVaultRebalanceTest is MasterVaultCoreTest {
         vault.setTargetAllocationWad(49e16); // tiny change to trigger small withdraw
         vm.warp(block.timestamp + 2);
         vm.prank(keeper);
-        vm.expectRevert();
+        vm.expectRevert(abi.encodeWithSelector(
+            MasterVault.RebalanceAmountTooSmall.selector, false, 1e17 - 1, 1e17 - 1, 100e18
+        ));
         vault.rebalance(0);
     }
 
@@ -82,7 +84,9 @@ contract MasterVaultRebalanceTest is MasterVaultCoreTest {
         vm.warp(block.timestamp + 2);
         // Pass a very high minExchRateWad so the exchange rate check fails
         vm.prank(keeper);
-        vm.expectRevert(); // todo: fix empty expectRevert
+        vm.expectRevert(abi.encodeWithSelector(
+            MasterVault.RebalanceExchRateTooLow.selector, int256(100e18), int256(6e18 - 1), 6e18 - 1
+        ));
         vault.rebalance(int256(100e18));
     }
 
@@ -92,7 +96,9 @@ contract MasterVaultRebalanceTest is MasterVaultCoreTest {
         vault.setTargetAllocationWad(5e17);
         vm.warp(block.timestamp + 2);
         vm.prank(keeper);
-        vm.expectRevert();
+        vm.expectRevert(abi.encodeWithSelector(
+            MasterVault.RebalanceAmountTooSmall.selector, true, 5e18 - 1, 5e18 - 1, 100e18
+        ));
         vault.rebalance(-1e18);
     }
 
@@ -114,7 +120,9 @@ contract MasterVaultRebalanceTest is MasterVaultCoreTest {
         vm.warp(block.timestamp + 2);
         // Pass -1 (tolerance of 1 wei per share) - actual rate is 1e18, so 1e18 > 1 reverts
         vm.prank(keeper);
-        vm.expectRevert();
+        vm.expectRevert(abi.encodeWithSelector(
+            MasterVault.RebalanceExchRateTooLow.selector, int256(-1), -int256(5e18 - 1), 5e18 - 1
+        ));
         vault.rebalance(-1);
     }
 

test-foundry/libraries/vault/mutation/MasterVaultRebalanceCooldown.t.sol

@@ -20,7 +20,7 @@ contract MasterVaultRebalanceCooldownTest is MasterVaultCoreTest {
         // With mutant (+): timeSinceLastRebalance = 105+100=205 >= 10, no cooldown revert
         // With correct code (-): timeSinceLastRebalance = 105-100=5 < 10, cooldown revert
         vm.prank(keeper);
-        vm.expectRevert();
+        vm.expectRevert(abi.encodeWithSelector(MasterVault.RebalanceCooldownNotMet.selector, uint256(5), uint256(10)));
         vault.rebalance(-1e18);
     }
 
@@ -36,7 +36,7 @@ contract MasterVaultRebalanceCooldownTest is MasterVaultCoreTest {
         // Warp only 50s (less than 100 cooldown)
         vm.warp(block.timestamp + 50);
         vm.prank(keeper);
-        vm.expectRevert();
+        vm.expectRevert(abi.encodeWithSelector(MasterVault.RebalanceCooldownNotMet.selector, uint256(50), uint256(100)));
         vault.rebalance(-1e18);
     }
 }

test-foundry/libraries/vault/mutation/MasterVaultSetSubVault.t.sol

@@ -44,8 +44,9 @@ contract MasterVaultSetSubVaultTest is MasterVaultCoreTest {
         assertTrue(vault.subVault().balanceOf(address(vault)) > 0, "should have subvault shares");
         MockSubVault newSv = new MockSubVault(IERC20(address(token)), "New", "NEW");
         vault.setSubVaultWhitelist(address(newSv), true);
+        uint256 shares = vault.subVault().balanceOf(address(vault));
         vm.prank(generalManager);
-        vm.expectRevert();
+        vm.expectRevert(abi.encodeWithSelector(MasterVault.NonZeroSubVaultShares.selector, shares));
         vault.setSubVault(IERC4626(address(newSv)));
     }
 }

test-foundry/libraries/vault/mutation/MasterVaultSetters.t.sol

@@ -31,7 +31,7 @@ contract MasterVaultSettersTest is MasterVaultCoreTest {
     function test_setRebalanceCooldown_belowMinimum_reverts() public {
         uint256 minimum = vault.MIN_REBALANCE_COOLDOWN();
         vm.prank(generalManager);
-        vm.expectRevert();
+        vm.expectRevert(abi.encodeWithSelector(MasterVault.RebalanceCooldownTooLow.selector, uint32(0), uint32(1)));
         vault.setRebalanceCooldown(uint32(minimum - 1));
     }