T

Vectorized · Dec 9, 2024 · 6925fb4 · 6925fb4
1 parent 65e17b2
commit 6925fb4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/test/EnumerableRoles.t.sol b/test/EnumerableRoles.t.sol
@@ -210,6 +210,25 @@ contract EnumerableRolesTest is SoladyTest {
         }
     }
 
+    function testOnlyOwnerOrRole(uint256 allowedRole, uint256 holderRole) public {
+        address holder = _randomUniqueHashedAddress();
+        assertEq(mockEnumerableRoles.owner(), address(this));
+        if (holder == address(this)) return;
+        mockEnumerableRoles.setAllowedRole(allowedRole);
+        mockEnumerableRoles.setRoleDirect(holder, holderRole, true);
+        if (_randomChance(32)) {
+            mockEnumerableRoles.guardedByOnlyOwnerOrRole();
+        }
+        if (holderRole != allowedRole) {
+            vm.prank(holder);
+            vm.expectRevert(EnumerableRoles.EnumerableRolesUnauthorized.selector);
+            mockEnumerableRoles.guardedByOnlyOwnerOrRole();
+        } else {
+            vm.prank(holder);
+            mockEnumerableRoles.guardedByOnlyOwnerOrRole();
+        }
+    }
+
     function testSetAndGetRoles(bytes32) public {
         _TestTemps memory t;
         t.holders = _sampleUniqueAddresses(_randomUniform() & 7);

diff --git a/test/utils/mocks/MockEnumerableRoles.sol b/test/utils/mocks/MockEnumerableRoles.sol
@@ -13,6 +13,7 @@ contract MockEnumerableRoles is EnumerableRoles, Brutalizer {
         address owner;
         bool ownerReverts;
         bytes allowedRolesEncoded;
+        uint256 allowedRole;
     }
 
     event Yo();
@@ -57,10 +58,18 @@ contract MockEnumerableRoles is EnumerableRoles, Brutalizer {
         $.allowedRolesEncoded = value;
     }
 
+    function setAllowedRole(uint256 role) public {
+        $.allowedRole = role;
+    }
+
     function guardedByOnlyOwnerOrRoles() public onlyOwnerOrRoles($.allowedRolesEncoded) {
         emit Yo();
     }
 
+    function guardedByOnlyOwnerOrRole() public onlyOwnerOrRole($.allowedRole) {
+        emit Yo();
+    }
+
     function guardedByOnlyRoles() public onlyRoles($.allowedRolesEncoded) {
         emit Yo();
     }