From f975f52effe509956892240c2995c66a8a5d339b Mon Sep 17 00:00:00 2001 From: Raul Date: Fri, 15 Dec 2023 20:24:07 -0500 Subject: [PATCH] remove inconsistency in tests --- test/foundry/e2e/e2e.t.sol | 2 +- test/foundry/modules/licensing/LicensingFrameworkRepo.t.sol | 4 ++-- test/foundry/utils/BaseTest.sol | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/foundry/e2e/e2e.t.sol b/test/foundry/e2e/e2e.t.sol index 9d3bb77b..2682fdcc 100644 --- a/test/foundry/e2e/e2e.t.sol +++ b/test/foundry/e2e/e2e.t.sol @@ -85,7 +85,7 @@ contract E2ETest is IE2ETest, BaseTest { function setUp() public virtual override { super.setUp(); _grantRole(vm, AccessControl.RELATIONSHIP_MANAGER_ROLE, admin); - _grantRole(vm, AccessControl.LICENSING_MANAGER, admin); + _grantRole(vm, AccessControl.LICENSING_MANAGER_ROLE, admin); _grantRole( vm, AccessControl.HOOK_CALLER_ROLE, diff --git a/test/foundry/modules/licensing/LicensingFrameworkRepo.t.sol b/test/foundry/modules/licensing/LicensingFrameworkRepo.t.sol index a19f650a..a5d60ffe 100644 --- a/test/foundry/modules/licensing/LicensingFrameworkRepo.t.sol +++ b/test/foundry/modules/licensing/LicensingFrameworkRepo.t.sol @@ -22,7 +22,7 @@ contract LicensingFrameworkRepoTest is Test, AccessControlHelper { function setUp() public { _setupAccessControl(); - _grantRole(vm, AccessControl.LICENSING_MANAGER, admin); + _grantRole(vm, AccessControl.LICENSING_MANAGER_ROLE, admin); repo = new LicensingFrameworkRepo(address(accessControl)); } @@ -68,7 +68,7 @@ contract LicensingFrameworkRepoTest is Test, AccessControlHelper { vm.expectRevert( abi.encodeWithSelector( Errors.MissingRole.selector, - AccessControl.LICENSING_MANAGER, + AccessControl.LICENSING_MANAGER_ROLE, address(this) ) ); diff --git a/test/foundry/utils/BaseTest.sol b/test/foundry/utils/BaseTest.sol index 49b48c0a..71e93e04 100644 --- a/test/foundry/utils/BaseTest.sol +++ b/test/foundry/utils/BaseTest.sol @@ -77,7 +77,7 @@ contract BaseTest is BaseTestUtils, ProxyHelper, AccessControlHelper { // Create Licensing contracts licensingFrameworkRepo = new LicensingFrameworkRepo(address(accessControl)); - _grantRole(vm, AccessControl.LICENSING_MANAGER, licensingManager); + _grantRole(vm, AccessControl.LICENSING_MANAGER_ROLE, licensingManager); licenseRegistry = new LicenseRegistry( address(registry),