@layerzerolabs/utils-upgradeable-evm-contracts 1.2.9 → 1.2.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/utils-upgradeable-evm-contracts",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "private": false,
   "description": "LayerZero Labs reference EVM upgradeable utility implementations",
   "license": "MIT",
@@ -10,9 +10,9 @@
     "@openzeppelin/contracts": "^5.0.2",
     "@openzeppelin/contracts-upgradeable": "^5.0.2",
     "solhint": "^6.0.1",
-    "@layerzerolabs/utils-evm-contracts": "1.2.9",
-    "@layerzerolabs/vm-tooling-evm": "1.2.9",
-    "@layerzerolabs/solhint-configuration": "1.2.9"
+    "@layerzerolabs/utils-evm-contracts": "1.2.10",
+    "@layerzerolabs/solhint-configuration": "1.2.10",
+    "@layerzerolabs/vm-tooling-evm": "1.2.10"
   },
   "publishConfig": {
     "access": "public",

package/test/AccessControl2StepUpgradeable.t.sol

@@ -10,7 +10,7 @@ import {
     IAccessControl2Step
 } from "./../contracts/access/AccessControl2StepUpgradeable.sol";
 
-contract AccessControl2StepUpgradeableMock is AccessControl2StepUpgradeable {
+contract AccessControl2StepUpgradeableHarness is AccessControl2StepUpgradeable {
     bytes32 public constant TEST_ROLE = keccak256("TEST_ROLE");
     bytes32 public constant OTHER_ROLE = keccak256("OTHER_ROLE");
 
@@ -28,7 +28,7 @@ contract AccessControl2StepUpgradeableMock is AccessControl2StepUpgradeable {
 }
 
 contract AccessControl2StepUpgradeableTest is Test {
-    AccessControl2StepUpgradeableMock mock;
+    AccessControl2StepUpgradeableHarness accessControl;
 
     address initialAdmin = address(this);
     address alice = makeAddr("alice");
@@ -39,8 +39,8 @@ contract AccessControl2StepUpgradeableTest is Test {
     bytes32 defaultAdminRole;
     bytes32 testRole;
 
-    function setUp() public {
-        AccessControl2StepUpgradeableMock impl = new AccessControl2StepUpgradeableMock();
+    function _deployAccessControl() internal returns (AccessControl2StepUpgradeableHarness) {
+        AccessControl2StepUpgradeableHarness impl = new AccessControl2StepUpgradeableHarness();
 
         uint256 currentNonce = vm.getNonce(address(this));
         proxyAdmin = vm.computeCreateAddress(vm.computeCreateAddress(address(this), currentNonce), 1);
@@ -48,78 +48,82 @@ contract AccessControl2StepUpgradeableTest is Test {
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(
             address(impl),
             address(this),
-            abi.encodeWithSelector(AccessControl2StepUpgradeableMock.initialize.selector, address(this))
+            abi.encodeWithSelector(AccessControl2StepUpgradeableHarness.initialize.selector, address(this))
         );
-        mock = AccessControl2StepUpgradeableMock(address(proxy));
-        defaultAdminRole = mock.DEFAULT_ADMIN_ROLE();
-        testRole = mock.TEST_ROLE();
+        return AccessControl2StepUpgradeableHarness(address(proxy));
+    }
+
+    function setUp() public {
+        accessControl = _deployAccessControl();
+        defaultAdminRole = accessControl.DEFAULT_ADMIN_ROLE();
+        testRole = accessControl.TEST_ROLE();
     }
 
     // ============ Initialization ============
 
     function test_initialize_Success_AdminHasRole() public view {
-        assertTrue(mock.hasRole(defaultAdminRole, initialAdmin));
-        assertEq(mock.getRoleMemberCount(defaultAdminRole), 1);
-        assertEq(mock.getRoleMember(defaultAdminRole, 0), initialAdmin);
-        assertEq(mock.defaultAdmin(), initialAdmin);
+        assertTrue(accessControl.hasRole(defaultAdminRole, initialAdmin));
+        assertEq(accessControl.getRoleMemberCount(defaultAdminRole), 1);
+        assertEq(accessControl.getRoleMember(defaultAdminRole, 0), initialAdmin);
+        assertEq(accessControl.defaultAdmin(), initialAdmin);
     }
 
     function test_initialize_Revert_AlreadyInitialized() public {
         vm.expectRevert(Initializable.InvalidInitialization.selector);
-        mock.initialize(address(0x999));
+        accessControl.initialize(address(0x999));
     }
 
     function test_initialize_Revert_InvalidDefaultAdmin() public {
-        AccessControl2StepUpgradeableMock impl = new AccessControl2StepUpgradeableMock();
+        AccessControl2StepUpgradeableHarness impl = new AccessControl2StepUpgradeableHarness();
         vm.expectRevert(abi.encodeWithSelector(IAccessControl2Step.InvalidDefaultAdmin.selector, address(0)));
         new TransparentUpgradeableProxy(
             address(impl),
             address(this),
-            abi.encodeWithSelector(AccessControl2StepUpgradeableMock.initialize.selector, address(0))
+            abi.encodeWithSelector(AccessControl2StepUpgradeableHarness.initialize.selector, address(0))
         );
     }
 
     // ============ defaultAdmin ============
 
     function test_defaultAdmin_ReturnsInitialAdmin() public view {
-        assertEq(mock.defaultAdmin(), initialAdmin);
+        assertEq(accessControl.defaultAdmin(), initialAdmin);
     }
 
     // ============ pendingDefaultAdmin ============
 
     function test_pendingDefaultAdmin_InitiallyZero() public view {
-        assertEq(mock.pendingDefaultAdmin(), address(0));
+        assertEq(accessControl.pendingDefaultAdmin(), address(0));
     }
 
     // ============ beginDefaultAdminTransfer ============
 
     function test_beginDefaultAdminTransfer_Success() public {
-        vm.expectEmit(true, true, true, true, address(mock));
+        vm.expectEmit(true, true, true, true, address(accessControl));
         emit IAccessControl2Step.DefaultAdminTransferStarted(alice);
 
-        mock.beginDefaultAdminTransfer(alice);
+        accessControl.beginDefaultAdminTransfer(alice);
 
-        assertEq(mock.pendingDefaultAdmin(), alice);
-        assertEq(mock.defaultAdmin(), initialAdmin);
+        assertEq(accessControl.pendingDefaultAdmin(), alice);
+        assertEq(accessControl.defaultAdmin(), initialAdmin);
     }
 
     function test_beginDefaultAdminTransfer_Success_OverwritesPending() public {
-        mock.beginDefaultAdminTransfer(alice);
-        assertEq(mock.pendingDefaultAdmin(), alice);
+        accessControl.beginDefaultAdminTransfer(alice);
+        assertEq(accessControl.pendingDefaultAdmin(), alice);
 
-        mock.beginDefaultAdminTransfer(bob);
-        assertEq(mock.pendingDefaultAdmin(), bob);
+        accessControl.beginDefaultAdminTransfer(bob);
+        assertEq(accessControl.pendingDefaultAdmin(), bob);
     }
 
     function test_beginDefaultAdminTransfer_Success_CancelsBySettingZero() public {
-        mock.beginDefaultAdminTransfer(alice);
-        assertEq(mock.pendingDefaultAdmin(), alice);
+        accessControl.beginDefaultAdminTransfer(alice);
+        assertEq(accessControl.pendingDefaultAdmin(), alice);
 
-        vm.expectEmit(true, true, true, true, address(mock));
+        vm.expectEmit(true, true, true, true, address(accessControl));
         emit IAccessControl2Step.DefaultAdminTransferStarted(address(0));
 
-        mock.beginDefaultAdminTransfer(address(0));
-        assertEq(mock.pendingDefaultAdmin(), address(0));
+        accessControl.beginDefaultAdminTransfer(address(0));
+        assertEq(accessControl.pendingDefaultAdmin(), address(0));
     }
 
     function test_beginDefaultAdminTransfer_Revert_Unauthorized() public {
@@ -127,49 +131,49 @@ contract AccessControl2StepUpgradeableTest is Test {
             abi.encodeWithSelector(IAccessControl.AccessControlUnauthorizedAccount.selector, alice, defaultAdminRole)
         );
         vm.prank(alice);
-        mock.beginDefaultAdminTransfer(bob);
+        accessControl.beginDefaultAdminTransfer(bob);
     }
 
     // ============ acceptDefaultAdminTransfer ============
 
     function test_acceptDefaultAdminTransfer_Success() public {
-        mock.beginDefaultAdminTransfer(alice);
+        accessControl.beginDefaultAdminTransfer(alice);
 
         vm.prank(alice);
-        mock.acceptDefaultAdminTransfer();
+        accessControl.acceptDefaultAdminTransfer();
 
-        assertTrue(mock.hasRole(defaultAdminRole, alice));
-        assertFalse(mock.hasRole(defaultAdminRole, initialAdmin));
-        assertEq(mock.getRoleMemberCount(defaultAdminRole), 1);
-        assertEq(mock.getRoleMember(defaultAdminRole, 0), alice);
-        assertEq(mock.defaultAdmin(), alice);
-        assertEq(mock.pendingDefaultAdmin(), address(0));
+        assertTrue(accessControl.hasRole(defaultAdminRole, alice));
+        assertFalse(accessControl.hasRole(defaultAdminRole, initialAdmin));
+        assertEq(accessControl.getRoleMemberCount(defaultAdminRole), 1);
+        assertEq(accessControl.getRoleMember(defaultAdminRole, 0), alice);
+        assertEq(accessControl.defaultAdmin(), alice);
+        assertEq(accessControl.pendingDefaultAdmin(), address(0));
     }
 
     function test_acceptDefaultAdminTransfer_Revert_NotPendingAdmin() public {
-        mock.beginDefaultAdminTransfer(alice);
+        accessControl.beginDefaultAdminTransfer(alice);
 
         vm.expectRevert(abi.encodeWithSelector(IAccessControl2Step.CallerNotPendingAdmin.selector, alice));
         vm.prank(bob);
-        mock.acceptDefaultAdminTransfer();
+        accessControl.acceptDefaultAdminTransfer();
     }
 
     function test_acceptDefaultAdminTransfer_Revert_NoPendingTransfer() public {
         vm.expectRevert(abi.encodeWithSelector(IAccessControl2Step.CallerNotPendingAdmin.selector, address(0)));
         vm.prank(alice);
-        mock.acceptDefaultAdminTransfer();
+        accessControl.acceptDefaultAdminTransfer();
     }
 
     // ============ grantRole ============
 
     function test_grantRole_Revert_DefaultAdminRole() public {
         vm.expectRevert(abi.encodeWithSelector(IAccessControl2Step.AccessControlEnforcedDefaultAdminRules.selector));
-        mock.grantRole(defaultAdminRole, alice);
+        accessControl.grantRole(defaultAdminRole, alice);
     }
 
     function test_grantRole_Success_NonAdminRole() public {
-        mock.grantRole(testRole, alice);
-        assertTrue(mock.hasRole(testRole, alice));
+        accessControl.grantRole(testRole, alice);
+        assertTrue(accessControl.hasRole(testRole, alice));
     }
 
     // ============ revokeRole ============
@@ -179,80 +183,80 @@ contract AccessControl2StepUpgradeableTest is Test {
             abi.encodeWithSelector(IAccessControl.AccessControlUnauthorizedAccount.selector, alice, defaultAdminRole)
         );
         vm.prank(alice);
-        mock.revokeRole(defaultAdminRole, initialAdmin);
+        accessControl.revokeRole(defaultAdminRole, initialAdmin);
     }
 
     function test_revokeRole_Revert_DefaultAdminRole_Admin() public {
         vm.expectRevert(abi.encodeWithSelector(IAccessControl2Step.AccessControlEnforcedDefaultAdminRules.selector));
-        mock.revokeRole(defaultAdminRole, initialAdmin);
+        accessControl.revokeRole(defaultAdminRole, initialAdmin);
     }
 
     function test_revokeRole_Success_NonAdminRole_Admin() public {
-        mock.grantRole(testRole, alice);
-        assertTrue(mock.hasRole(testRole, alice));
+        accessControl.grantRole(testRole, alice);
+        assertTrue(accessControl.hasRole(testRole, alice));
 
-        mock.revokeRole(testRole, alice);
-        assertFalse(mock.hasRole(testRole, alice));
+        accessControl.revokeRole(testRole, alice);
+        assertFalse(accessControl.hasRole(testRole, alice));
     }
 
     function test_revokeRole_Revert_NonAdminRole_NonAdmin() public {
-        mock.grantRole(testRole, alice);
-        assertTrue(mock.hasRole(testRole, alice));
+        accessControl.grantRole(testRole, alice);
+        assertTrue(accessControl.hasRole(testRole, alice));
 
         vm.expectRevert(
             abi.encodeWithSelector(IAccessControl.AccessControlUnauthorizedAccount.selector, alice, defaultAdminRole)
         );
         vm.prank(alice);
-        mock.revokeRole(testRole, alice);
+        accessControl.revokeRole(testRole, alice);
     }
 
     // ============ renounceRole ============
 
     function test_renounceRole_Revert_DefaultAdminRole() public {
         vm.expectRevert(abi.encodeWithSelector(IAccessControl2Step.AccessControlEnforcedDefaultAdminRules.selector));
-        mock.renounceRole(defaultAdminRole, initialAdmin);
+        accessControl.renounceRole(defaultAdminRole, initialAdmin);
     }
 
     function test_renounceRole_Revert_DefaultAdminRoleDuringPendingTransfer() public {
-        mock.beginDefaultAdminTransfer(alice);
+        accessControl.beginDefaultAdminTransfer(alice);
 
         vm.expectRevert(abi.encodeWithSelector(IAccessControl2Step.AccessControlEnforcedDefaultAdminRules.selector));
-        mock.renounceRole(defaultAdminRole, initialAdmin);
+        accessControl.renounceRole(defaultAdminRole, initialAdmin);
     }
 
     function test_renounceRole_Success_NonAdminRole_NonAdmin() public {
-        mock.grantRole(testRole, alice);
+        accessControl.grantRole(testRole, alice);
 
         vm.startPrank(alice);
-        mock.renounceRole(testRole, alice);
+        accessControl.renounceRole(testRole, alice);
         vm.stopPrank();
 
-        assertFalse(mock.hasRole(testRole, alice));
+        assertFalse(accessControl.hasRole(testRole, alice));
     }
 
     function test_renounceRole_Success_NonAdminRole_Admin() public {
-        mock.grantRole(testRole, initialAdmin);
-        mock.renounceRole(testRole, initialAdmin);
+        accessControl.grantRole(testRole, initialAdmin);
+        accessControl.renounceRole(testRole, initialAdmin);
 
-        assertFalse(mock.hasRole(testRole, initialAdmin));
+        assertFalse(accessControl.hasRole(testRole, initialAdmin));
     }
 
     // ============ setRoleAdmin ============
 
     function test_setRoleAdmin_Success_NonAdminRole_Self() public {
-        mock.exposedSetRoleAdmin(testRole, defaultAdminRole);
-        assertEq(mock.getRoleAdmin(testRole), defaultAdminRole);
+        accessControl.exposedSetRoleAdmin(testRole, defaultAdminRole);
+        assertEq(accessControl.getRoleAdmin(testRole), defaultAdminRole);
     }
 
     function test_setRoleAdmin_Success_NonAdminRole_Other() public {
-        bytes32 otherRole = mock.OTHER_ROLE();
-        mock.exposedSetRoleAdmin(testRole, otherRole);
-        assertEq(mock.getRoleAdmin(testRole), otherRole);
+        bytes32 otherRole = accessControl.OTHER_ROLE();
+        accessControl.exposedSetRoleAdmin(testRole, otherRole);
+        assertEq(accessControl.getRoleAdmin(testRole), otherRole);
     }
 
     function test_setRoleAdmin_Revert_DefaultAdminRole() public {
         vm.expectRevert(abi.encodeWithSelector(IAccessControl2Step.AccessControlEnforcedDefaultAdminRules.selector));
-        mock.exposedSetRoleAdmin(defaultAdminRole, testRole);
+        accessControl.exposedSetRoleAdmin(defaultAdminRole, testRole);
     }
 
     // ============ Storage ============
@@ -268,9 +272,9 @@ contract AccessControl2StepUpgradeableTest is Test {
     // ============ Fuzz ============
 
     function test_beginDefaultAdminTransfer_Fuzz(address _newAdmin) public {
-        mock.beginDefaultAdminTransfer(_newAdmin);
-        assertEq(mock.pendingDefaultAdmin(), _newAdmin);
-        assertEq(mock.defaultAdmin(), initialAdmin);
+        accessControl.beginDefaultAdminTransfer(_newAdmin);
+        assertEq(accessControl.pendingDefaultAdmin(), _newAdmin);
+        assertEq(accessControl.defaultAdmin(), initialAdmin);
     }
 
     function test_acceptDefaultAdminTransfer_Fuzz(address _newAdmin) public {
@@ -278,97 +282,97 @@ contract AccessControl2StepUpgradeableTest is Test {
         vm.assume(_newAdmin != proxyAdmin);
         vm.assume(_newAdmin != initialAdmin);
 
-        mock.beginDefaultAdminTransfer(_newAdmin);
+        accessControl.beginDefaultAdminTransfer(_newAdmin);
         vm.prank(_newAdmin);
-        mock.acceptDefaultAdminTransfer();
+        accessControl.acceptDefaultAdminTransfer();
 
-        assertTrue(mock.hasRole(defaultAdminRole, _newAdmin));
-        assertFalse(mock.hasRole(defaultAdminRole, initialAdmin));
-        assertEq(mock.defaultAdmin(), _newAdmin);
-        assertEq(mock.pendingDefaultAdmin(), address(0));
-        assertEq(mock.getRoleMemberCount(defaultAdminRole), 1);
-        assertEq(mock.getRoleMember(defaultAdminRole, 0), _newAdmin);
+        assertTrue(accessControl.hasRole(defaultAdminRole, _newAdmin));
+        assertFalse(accessControl.hasRole(defaultAdminRole, initialAdmin));
+        assertEq(accessControl.defaultAdmin(), _newAdmin);
+        assertEq(accessControl.pendingDefaultAdmin(), address(0));
+        assertEq(accessControl.getRoleMemberCount(defaultAdminRole), 1);
+        assertEq(accessControl.getRoleMember(defaultAdminRole, 0), _newAdmin);
     }
 
     // ============ Edge Cases ============
 
     function test_acceptDefaultAdminTransfer_Revert_StalePendingAfterOverwrite() public {
-        mock.beginDefaultAdminTransfer(alice);
-        mock.beginDefaultAdminTransfer(bob); // Overwrite
+        accessControl.beginDefaultAdminTransfer(alice);
+        accessControl.beginDefaultAdminTransfer(bob); // Overwrite
 
         // `alice` (stale pending) cannot accept.
         vm.expectRevert(abi.encodeWithSelector(IAccessControl2Step.CallerNotPendingAdmin.selector, bob));
         vm.prank(alice);
-        mock.acceptDefaultAdminTransfer();
+        accessControl.acceptDefaultAdminTransfer();
 
         // `bob` (current pending) can accept.
         vm.prank(bob);
-        mock.acceptDefaultAdminTransfer();
+        accessControl.acceptDefaultAdminTransfer();
 
-        assertTrue(mock.hasRole(defaultAdminRole, bob));
-        assertFalse(mock.hasRole(defaultAdminRole, alice));
+        assertTrue(accessControl.hasRole(defaultAdminRole, bob));
+        assertFalse(accessControl.hasRole(defaultAdminRole, alice));
     }
 
     function test_acceptDefaultAdminTransfer_Revert_AfterCancel() public {
-        mock.beginDefaultAdminTransfer(alice);
-        mock.beginDefaultAdminTransfer(address(0)); // Cancel
+        accessControl.beginDefaultAdminTransfer(alice);
+        accessControl.beginDefaultAdminTransfer(address(0)); // Cancel
 
         vm.expectRevert(abi.encodeWithSelector(IAccessControl2Step.CallerNotPendingAdmin.selector, address(0)));
         vm.prank(alice);
-        mock.acceptDefaultAdminTransfer();
+        accessControl.acceptDefaultAdminTransfer();
     }
 
     function test_acceptDefaultAdminTransfer_Events() public {
-        mock.beginDefaultAdminTransfer(alice);
+        accessControl.beginDefaultAdminTransfer(alice);
 
-        vm.expectEmit(true, true, true, true, address(mock));
+        vm.expectEmit(true, true, true, true, address(accessControl));
         emit IAccessControl.RoleRevoked(defaultAdminRole, initialAdmin, alice);
-        vm.expectEmit(true, true, true, true, address(mock));
+        vm.expectEmit(true, true, true, true, address(accessControl));
         emit IAccessControl.RoleGranted(defaultAdminRole, alice, alice);
 
         vm.prank(alice);
-        mock.acceptDefaultAdminTransfer();
+        accessControl.acceptDefaultAdminTransfer();
     }
 
     // ============ Integration ============
 
     function test_integration_TransferAndTransferAgain() public {
         // Admin transfers to `alice`.
-        mock.beginDefaultAdminTransfer(alice);
+        accessControl.beginDefaultAdminTransfer(alice);
         vm.prank(alice);
-        mock.acceptDefaultAdminTransfer();
+        accessControl.acceptDefaultAdminTransfer();
 
         // `alice` transfers to `bob`.
         vm.prank(alice);
-        mock.beginDefaultAdminTransfer(bob);
+        accessControl.beginDefaultAdminTransfer(bob);
         vm.prank(bob);
-        mock.acceptDefaultAdminTransfer();
+        accessControl.acceptDefaultAdminTransfer();
 
         // `bob` transfers to `charlie`.
         vm.prank(bob);
-        mock.beginDefaultAdminTransfer(charlie);
+        accessControl.beginDefaultAdminTransfer(charlie);
         vm.prank(charlie);
-        mock.acceptDefaultAdminTransfer();
+        accessControl.acceptDefaultAdminTransfer();
 
-        assertTrue(mock.hasRole(defaultAdminRole, charlie));
-        assertFalse(mock.hasRole(defaultAdminRole, bob));
-        assertFalse(mock.hasRole(defaultAdminRole, alice));
-        assertFalse(mock.hasRole(defaultAdminRole, initialAdmin));
-        assertEq(mock.getRoleMemberCount(defaultAdminRole), 1);
+        assertTrue(accessControl.hasRole(defaultAdminRole, charlie));
+        assertFalse(accessControl.hasRole(defaultAdminRole, bob));
+        assertFalse(accessControl.hasRole(defaultAdminRole, alice));
+        assertFalse(accessControl.hasRole(defaultAdminRole, initialAdmin));
+        assertEq(accessControl.getRoleMemberCount(defaultAdminRole), 1);
     }
 
     function test_integration_TransferCancelRetransfer() public {
         // Admin starts transfer to `alice` then cancels.
-        mock.beginDefaultAdminTransfer(alice);
-        mock.beginDefaultAdminTransfer(address(0)); // Cancel
+        accessControl.beginDefaultAdminTransfer(alice);
+        accessControl.beginDefaultAdminTransfer(address(0)); // Cancel
 
         // Admin starts transfer to `bob` and `bob` accepts.
-        mock.beginDefaultAdminTransfer(bob);
+        accessControl.beginDefaultAdminTransfer(bob);
         vm.prank(bob);
-        mock.acceptDefaultAdminTransfer();
+        accessControl.acceptDefaultAdminTransfer();
 
-        assertTrue(mock.hasRole(defaultAdminRole, bob));
-        assertFalse(mock.hasRole(defaultAdminRole, initialAdmin));
-        assertEq(mock.getRoleMemberCount(defaultAdminRole), 1);
+        assertTrue(accessControl.hasRole(defaultAdminRole, bob));
+        assertFalse(accessControl.hasRole(defaultAdminRole, initialAdmin));
+        assertEq(accessControl.getRoleMemberCount(defaultAdminRole), 1);
     }
 }

package/test/AllowlistBaseUpgradeable.t.sol

@@ -6,14 +6,7 @@ import { TransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/trans
 import { Test } from "forge-std/Test.sol";
 import { AllowlistBaseUpgradeable } from "./../contracts/allowlist/AllowlistBaseUpgradeable.sol";
 
-interface IAllowlistMock is IAllowlist {
-    function setAllowlistMode(AllowlistMode _mode) external;
-    function setWhitelisted(SetAllowlistParam[] calldata _params) external;
-    function setBlacklisted(SetAllowlistParam[] calldata _params) external;
-    function restrictedFunction() external view returns (bool);
-}
-
-contract AllowlistBaseUpgradeableMock is AllowlistBaseUpgradeable {
+contract AllowlistBaseUpgradeableHarness is AllowlistBaseUpgradeable {
     constructor() {
         _disableInitializers();
     }
@@ -40,24 +33,26 @@ contract AllowlistBaseUpgradeableMock is AllowlistBaseUpgradeable {
 }
 
 contract AllowlistBaseUpgradeableTest is Test {
-    IAllowlistMock allowlist;
+    AllowlistBaseUpgradeableHarness allowlist;
 
     address alice = makeAddr("alice");
     address bob = makeAddr("bob");
     address charlie = makeAddr("charlie");
 
-    function _createAllowlist(IAllowlist.AllowlistMode _mode) internal virtual returns (IAllowlistMock) {
-        AllowlistBaseUpgradeableMock impl = new AllowlistBaseUpgradeableMock();
+    function _deployAllowlist(
+        IAllowlist.AllowlistMode _mode
+    ) internal virtual returns (AllowlistBaseUpgradeableHarness) {
+        AllowlistBaseUpgradeableHarness impl = new AllowlistBaseUpgradeableHarness();
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(
             address(impl),
             address(this),
-            abi.encodeWithSelector(AllowlistBaseUpgradeableMock.initialize.selector, _mode)
+            abi.encodeWithSelector(AllowlistBaseUpgradeableHarness.initialize.selector, _mode)
         );
-        return IAllowlistMock(address(proxy));
+        return AllowlistBaseUpgradeableHarness(address(proxy));
     }
 
     function setUp() public virtual {
-        allowlist = _createAllowlist(IAllowlist.AllowlistMode.Open);
+        allowlist = _deployAllowlist(IAllowlist.AllowlistMode.Open);
     }
 
     // ============ Initial State Tests ============
@@ -67,7 +62,7 @@ contract AllowlistBaseUpgradeableTest is Test {
     }
 
     function test_constructor_InitializeWhitelist() public {
-        IAllowlistMock al = _createAllowlist(IAllowlist.AllowlistMode.Whitelist);
+        AllowlistBaseUpgradeableHarness al = _deployAllowlist(IAllowlist.AllowlistMode.Whitelist);
         assertEq(uint256(al.allowlistMode()), uint256(IAllowlist.AllowlistMode.Whitelist));
     }
 

package/test/AllowlistRBACUpgradeable.t.sol

@@ -5,9 +5,9 @@ import { IAllowlist } from "@layerzerolabs/utils-evm-contracts/contracts/interfa
 import { IAccessControl } from "@openzeppelin/contracts/access/IAccessControl.sol";
 import { TransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import { AllowlistRBACUpgradeable } from "./../contracts/allowlist/AllowlistRBACUpgradeable.sol";
-import { AllowlistBaseUpgradeableTest, IAllowlistMock } from "./AllowlistBaseUpgradeable.t.sol";
+import { AllowlistBaseUpgradeableTest, AllowlistBaseUpgradeableHarness } from "./AllowlistBaseUpgradeable.t.sol";
 
-contract AllowlistRBACUpgradeableMock is AllowlistRBACUpgradeable {
+contract AllowlistRBACUpgradeableHarness is AllowlistRBACUpgradeable {
     constructor() {
         _disableInitializers();
     }
@@ -24,22 +24,26 @@ contract AllowlistRBACUpgradeableMock is AllowlistRBACUpgradeable {
 
 contract AllowlistRBACUpgradeableTest is AllowlistBaseUpgradeableTest {
     address dave = makeAddr("dave");
+    AllowlistRBACUpgradeableHarness allowlistRbac;
 
-    function _createAllowlist(IAllowlist.AllowlistMode _mode) internal virtual override returns (IAllowlistMock) {
-        AllowlistRBACUpgradeableMock impl = new AllowlistRBACUpgradeableMock();
+    function _deployAllowlist(
+        IAllowlist.AllowlistMode _mode
+    ) internal virtual override returns (AllowlistBaseUpgradeableHarness) {
+        AllowlistRBACUpgradeableHarness impl = new AllowlistRBACUpgradeableHarness();
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(
             address(impl),
             address(this),
-            abi.encodeWithSelector(AllowlistRBACUpgradeableMock.initialize.selector, _mode, address(this))
+            abi.encodeWithSelector(AllowlistRBACUpgradeableHarness.initialize.selector, _mode, address(this))
         );
-        AllowlistRBACUpgradeableMock _allowlist = AllowlistRBACUpgradeableMock(address(proxy));
-        _allowlist.grantRole(_allowlist.WHITELISTER_ROLE(), address(this));
-        _allowlist.grantRole(_allowlist.BLACKLISTER_ROLE(), address(this));
-        return IAllowlistMock(address(proxy));
+        AllowlistRBACUpgradeableHarness rbac = AllowlistRBACUpgradeableHarness(address(proxy));
+        rbac.grantRole(rbac.WHITELISTER_ROLE(), address(this));
+        rbac.grantRole(rbac.BLACKLISTER_ROLE(), address(this));
+        return AllowlistBaseUpgradeableHarness(address(proxy));
     }
 
     function setUp() public override {
-        allowlist = _createAllowlist(IAllowlist.AllowlistMode.Open);
+        super.setUp();
+        allowlistRbac = AllowlistRBACUpgradeableHarness(address(allowlist));
     }
 
     function test_setAllowlistMode_Revert_Unauthorized() public virtual {
@@ -47,11 +51,11 @@ contract AllowlistRBACUpgradeableTest is AllowlistBaseUpgradeableTest {
             abi.encodeWithSelector(
                 IAccessControl.AccessControlUnauthorizedAccount.selector,
                 dave,
-                AllowlistRBACUpgradeableMock(address(allowlist)).DEFAULT_ADMIN_ROLE()
+                allowlistRbac.DEFAULT_ADMIN_ROLE()
             )
         );
         vm.prank(dave);
-        AllowlistRBACUpgradeableMock(address(allowlist)).setAllowlistMode(IAllowlist.AllowlistMode.Whitelist);
+        allowlistRbac.setAllowlistMode(IAllowlist.AllowlistMode.Whitelist);
     }
 
     function test_setWhitelisted_Revert_Unauthorized() public virtual {
@@ -61,11 +65,11 @@ contract AllowlistRBACUpgradeableTest is AllowlistBaseUpgradeableTest {
             abi.encodeWithSelector(
                 IAccessControl.AccessControlUnauthorizedAccount.selector,
                 dave,
-                AllowlistRBACUpgradeableMock(address(allowlist)).WHITELISTER_ROLE()
+                allowlistRbac.WHITELISTER_ROLE()
             )
         );
         vm.prank(dave);
-        AllowlistRBACUpgradeableMock(address(allowlist)).setWhitelisted(params);
+        allowlistRbac.setWhitelisted(params);
     }
 
     function test_setBlacklisted_Revert_Unauthorized() public virtual {
@@ -75,10 +79,10 @@ contract AllowlistRBACUpgradeableTest is AllowlistBaseUpgradeableTest {
             abi.encodeWithSelector(
                 IAccessControl.AccessControlUnauthorizedAccount.selector,
                 dave,
-                AllowlistRBACUpgradeableMock(address(allowlist)).BLACKLISTER_ROLE()
+                allowlistRbac.BLACKLISTER_ROLE()
             )
         );
         vm.prank(dave);
-        AllowlistRBACUpgradeableMock(address(allowlist)).setBlacklisted(params);
+        allowlistRbac.setBlacklisted(params);
     }
 }