fix tests where assumptions weren't set totally right. No changes to …

…actual code
Transient-Labs · Jul 31, 2024 · 8c76440 · 8c76440
1 parent 5a63267
commit 8c76440
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/test/access/OwnableAccessControl.t.sol b/test/access/OwnableAccessControl.t.sol
@@ -69,6 +69,8 @@ contract TestOwnableAccessControl is Test {
     }
 
     function test_AdminRole(address admin, address minter, uint256 newNumberOne, uint256 newNumberTwo) public {
+        vm.assume(admin != address(this));
+
         mockContract = new MockOwnableAccessControl();
         address[] memory admins = new address[](1);
         admins[0] = admin;
@@ -161,6 +163,8 @@ contract TestOwnableAccessControl is Test {
     }
 
     function test_MinterRole(address minter, uint256 newNumber) public {
+        vm.assume(minter != address(this));
+
         mockContract = new MockOwnableAccessControl();
         // grant minter role and expect proper event log
         address[] memory minters = new address[](1);

diff --git a/test/payments/TransferHelper.t.sol b/test/payments/TransferHelper.t.sol
@@ -134,7 +134,10 @@ contract TestTransferHelper is Test {
     }
 
     function test_SafeTransferFromERC20(address recipient, uint256 amount) public {
-        vm.assume(recipient != address(0) && recipient != address(th) && amount > 0);
+        vm.assume(recipient != address(0));
+        vm.assume(recipient != address(th));
+        vm.assume(recipient != chris);
+        vm.assume(amount > 0);
 
         // fund chris
         vm.prank(ben);

diff --git a/test/upgradeable/access/OwnableAccessControlUpgradeable.t.sol b/test/upgradeable/access/OwnableAccessControlUpgradeable.t.sol
@@ -86,6 +86,8 @@ contract OwnableAccessControlTest is Test {
     }
 
     function test_AdminRole(address admin, address minter, uint256 newNumberOne, uint256 newNumberTwo) public {
+        vm.assume(admin != address(this));
+
         mockContract = new MockOwnableAccessControlUpgradeable();
         mockContract.initialize(address(this));
         address[] memory admins = new address[](1);
@@ -187,6 +189,8 @@ contract OwnableAccessControlTest is Test {
     }
 
     function test_MinterRole(address minter, uint256 newNumber) public {
+        vm.assume(minter != address(this));
+
         mockContract = new MockOwnableAccessControlUpgradeable();
         mockContract.initialize(address(this));
         // grant minter role and expect proper event log