upgarde openZeppelin to 4.2.0 (#234)

fixes #200

Co-authored-by: Skanda Bhat <[email protected]>

contracts/Core/ACL.sol

@@ -8,9 +8,4 @@ contract ACL is AccessControl {
     constructor() {
         _setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
     }
-
-    modifier onlyRole(bytes32 _hash) {
-        require(hasRole(_hash, msg.sender), "ACL: sender not authorized");
-        _;
-    }
-}
+}

package.json

@@ -35,7 +35,7 @@
   },
   "homepage": "https://github.com/razor-network/contracts#readme",
   "dependencies": {
-    "@openzeppelin/contracts": "^4.0.0",
+    "@openzeppelin/contracts": "^4.2.0",
     "@razor-network/merkle": "^0.6.0",
     "hardhat-abi-exporter": "^2.2.1",
     "jsonfile": "^6.1.0"

test/ACL.js

@@ -14,7 +14,7 @@ describe('Access Control Test', async () => {
   let stakeManager;
   let rewardManager;
   let initializeContracts;
-  const expectedRevertMessage = 'ACL: sender not authorized';
+  const expectedRevertMessage = 'AccessControl';
 
   before(async () => {
     ({
@@ -485,7 +485,6 @@ describe('Access Control Test', async () => {
   });
 
   it('Default Admin should able to change, New admin should able to grant/revoke', async () => {
-    const expectedRevertMessage = 'AccessControl: sender must be an admin to grant';
     // Old admin should be able to grant admin role to another account
     await stakeManager.grantRole(DEFAULT_ADMIN_ROLE_HASH, signers[1].address);
 

test/BlockManager.js

@@ -82,7 +82,7 @@ describe('BlockManager', function () {
         voteManager.address,
         assetManager.address
       );
-      await assertRevert(tx, 'ACL: sender not authorized');
+      await assertRevert(tx, 'AccessControl');
     });
 
     it('should be able to initialize', async () => {

test/Parameters.js

@@ -14,7 +14,7 @@ describe('Parameters contract Tests', async () => {
   let signers;
   let snapShotId;
   let parameters;
-  const expectedRevertMessage = 'ACL: sender not authorized';
+  const expectedRevertMessage = 'AccessControl';
 
   // parameters as initiliazed in Parameters contract
   const commit = toBigNumber('0');

test/StakeManager.js

@@ -68,7 +68,7 @@ describe('StakeManager', function () {
         voteManager.address,
         parameters.address
       );
-      await assertRevert(tx, 'ACL: sender not authorized');
+      await assertRevert(tx, 'AccessControl');
     });
 
     it('should be able to initialize', async function () {
@@ -731,7 +731,7 @@ describe('StakeManager', function () {
       const balanceContractBefore = await razor.balanceOf(stakeManager.address);
       const balanceAdminBefore = await razor.balanceOf(signers[1].address);
       const tx = stakeManager.connect(signers[1]).escape(signers[1].address);
-      await assertRevert(tx, 'VM Exception while processing transaction: reverted with reason string \'ACL: sender not authorized\'');
+      await assertRevert(tx, 'AccessControl');
 
       const balanceContractAfter = await razor.balanceOf(stakeManager.address);
       const balanceAdminAfter = await razor.balanceOf(signers[1].address);

test/VoteManager.js

@@ -63,7 +63,7 @@ describe('VoteManager', function () {
 
       it('should not be able to initiliaze VoteManager contract without admin role', async () => {
         const tx = voteManager.connect(signers[1]).initialize(stakeManager.address, rewardManager.address, blockManager.address, parameters.address);
-        await assertRevert(tx, 'ACL: sender not authorized');
+        await assertRevert(tx, 'AccessControl');
       });
 
       it('should be able to initialize', async function () {