update tests for permissions enumerable

thirdweb-dev · Jul 13, 2023 · f124f56 · f124f56
1 parent 4eadfea
commit f124f56
Show file tree

Hide file tree

Showing 2 changed files with 115 additions and 0 deletions.
diff --git a/src/test/drop/DropERC721.t.sol b/src/test/drop/DropERC721.t.sol
@@ -146,6 +146,7 @@ contract DropERC721Test is BaseTest {
         drop.grantRole(role, address(4));
 
         roleMemberCount = drop.getRoleMemberCount(role);
+        assertEq(roleMemberCount, 5);
         console.log(roleMemberCount);
         for (uint256 i = 0; i < roleMemberCount; i++) {
             console.log(drop.getRoleMember(role, i));
@@ -154,6 +155,7 @@ contract DropERC721Test is BaseTest {
 
         drop.revokeRole(role, address(2));
         roleMemberCount = drop.getRoleMemberCount(role);
+        assertEq(roleMemberCount, 4);
         console.log(roleMemberCount);
         for (uint256 i = 0; i < roleMemberCount; i++) {
             console.log(drop.getRoleMember(role, i));
@@ -162,6 +164,7 @@ contract DropERC721Test is BaseTest {
 
         drop.revokeRole(role, address(0));
         roleMemberCount = drop.getRoleMemberCount(role);
+        assertEq(roleMemberCount, 3);
         console.log(roleMemberCount);
         for (uint256 i = 0; i < roleMemberCount; i++) {
             console.log(drop.getRoleMember(role, i));
@@ -170,6 +173,7 @@ contract DropERC721Test is BaseTest {
 
         drop.grantRole(role, address(5));
         roleMemberCount = drop.getRoleMemberCount(role);
+        assertEq(roleMemberCount, 4);
         console.log(roleMemberCount);
         for (uint256 i = 0; i < roleMemberCount; i++) {
             console.log(drop.getRoleMember(role, i));
@@ -178,6 +182,7 @@ contract DropERC721Test is BaseTest {
 
         drop.grantRole(role, address(0));
         roleMemberCount = drop.getRoleMemberCount(role);
+        assertEq(roleMemberCount, 5);
         console.log(roleMemberCount);
         for (uint256 i = 0; i < roleMemberCount; i++) {
             console.log(drop.getRoleMember(role, i));
@@ -186,6 +191,25 @@ contract DropERC721Test is BaseTest {
 
         drop.grantRole(role, address(6));
         roleMemberCount = drop.getRoleMemberCount(role);
+        assertEq(roleMemberCount, 6);
+        console.log(roleMemberCount);
+        for (uint256 i = 0; i < roleMemberCount; i++) {
+            console.log(drop.getRoleMember(role, i));
+        }
+        console.log("");
+
+        drop.revokeRole(role, address(0));
+        roleMemberCount = drop.getRoleMemberCount(role);
+        assertEq(roleMemberCount, 5);
+        console.log(roleMemberCount);
+        for (uint256 i = 0; i < roleMemberCount; i++) {
+            console.log(drop.getRoleMember(role, i));
+        }
+        console.log("");
+
+        drop.revokeRole(role, address(4));
+        roleMemberCount = drop.getRoleMemberCount(role);
+        assertEq(roleMemberCount, 4);
         console.log(roleMemberCount);
         for (uint256 i = 0; i < roleMemberCount; i++) {
             console.log(drop.getRoleMember(role, i));

diff --git a/src/test/marketplace/DirectListings.t.sol b/src/test/marketplace/DirectListings.t.sol
@@ -152,6 +152,97 @@ contract MarketplaceDirectListingsTest is BaseTest {
                             Miscellaneous
     //////////////////////////////////////////////////////////////*/
 
+    /**
+     *  @dev Tests contract state for Lister role.
+     */
+    function test_state_getRoleMember_listerRole() public {
+        bytes32 role = keccak256("LISTER_ROLE");
+
+        uint256 roleMemberCount = PermissionsEnumerable(marketplace).getRoleMemberCount(role);
+        assertEq(roleMemberCount, 1);
+
+        address roleMember = PermissionsEnumerable(marketplace).getRoleMember(role, 1);
+        assertEq(roleMember, address(0));
+
+        vm.startPrank(marketplaceDeployer);
+        Permissions(marketplace).grantRole(role, address(2));
+        Permissions(marketplace).grantRole(role, address(3));
+        Permissions(marketplace).grantRole(role, address(4));
+
+        roleMemberCount = PermissionsEnumerable(marketplace).getRoleMemberCount(role);
+        assertEq(roleMemberCount, 4);
+        console.log(roleMemberCount);
+        for (uint256 i = 0; i < roleMemberCount; i++) {
+            console.log(PermissionsEnumerable(marketplace).getRoleMember(role, i));
+        }
+        console.log("");
+
+        Permissions(marketplace).revokeRole(role, address(2));
+        roleMemberCount = PermissionsEnumerable(marketplace).getRoleMemberCount(role);
+        assertEq(roleMemberCount, 3);
+        console.log(roleMemberCount);
+        for (uint256 i = 0; i < roleMemberCount; i++) {
+            console.log(PermissionsEnumerable(marketplace).getRoleMember(role, i));
+        }
+        console.log("");
+
+        Permissions(marketplace).grantRole(role, address(5));
+        roleMemberCount = PermissionsEnumerable(marketplace).getRoleMemberCount(role);
+        assertEq(roleMemberCount, 4);
+        console.log(roleMemberCount);
+        for (uint256 i = 0; i < roleMemberCount; i++) {
+            console.log(PermissionsEnumerable(marketplace).getRoleMember(role, i));
+        }
+        console.log("");
+
+        Permissions(marketplace).grantRole(role, address(0));
+        roleMemberCount = PermissionsEnumerable(marketplace).getRoleMemberCount(role);
+        assertEq(roleMemberCount, 5);
+        console.log(roleMemberCount);
+        for (uint256 i = 0; i < roleMemberCount; i++) {
+            console.log(PermissionsEnumerable(marketplace).getRoleMember(role, i));
+        }
+        console.log("");
+
+        Permissions(marketplace).grantRole(role, address(6));
+        roleMemberCount = PermissionsEnumerable(marketplace).getRoleMemberCount(role);
+        assertEq(roleMemberCount, 6);
+        console.log(roleMemberCount);
+        for (uint256 i = 0; i < roleMemberCount; i++) {
+            console.log(PermissionsEnumerable(marketplace).getRoleMember(role, i));
+        }
+        console.log("");
+
+        Permissions(marketplace).revokeRole(role, address(3));
+        roleMemberCount = PermissionsEnumerable(marketplace).getRoleMemberCount(role);
+        assertEq(roleMemberCount, 5);
+        console.log(roleMemberCount);
+        for (uint256 i = 0; i < roleMemberCount; i++) {
+            console.log(PermissionsEnumerable(marketplace).getRoleMember(role, i));
+        }
+        console.log("");
+
+        Permissions(marketplace).revokeRole(role, address(4));
+        roleMemberCount = PermissionsEnumerable(marketplace).getRoleMemberCount(role);
+        assertEq(roleMemberCount, 4);
+        console.log(roleMemberCount);
+        for (uint256 i = 0; i < roleMemberCount; i++) {
+            console.log(PermissionsEnumerable(marketplace).getRoleMember(role, i));
+        }
+        console.log("");
+
+        Permissions(marketplace).revokeRole(role, address(0));
+        roleMemberCount = PermissionsEnumerable(marketplace).getRoleMemberCount(role);
+        assertEq(roleMemberCount, 3);
+        console.log(roleMemberCount);
+        for (uint256 i = 0; i < roleMemberCount; i++) {
+            console.log(PermissionsEnumerable(marketplace).getRoleMember(role, i));
+        }
+        console.log("");
+
+        vm.stopPrank();
+    }
+
     function test_state_approvedCurrencies() public {
         (uint256 listingId, IDirectListings.ListingParameters memory listingParams) = _setup_updateListing();
         address currencyToApprove = address(erc20); // same currency as main listing