Share roles in tests

OpenZeppelin · Feb 8, 2025 · 5875b15 · 5875b15
1 parent a0c20e0
commit 5875b15
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 27 deletions.
diff --git a/test/access/AccessControl.behavior.js b/test/access/AccessControl.behavior.js
@@ -1,11 +1,11 @@
 const { ethers } = require('hardhat');
 const { expect } = require('chai');
 
+const { DEFAULT_ADMIN_ROLE } = require('../helpers/roles');
 const time = require('../helpers/time');
 
 const { shouldSupportInterfaces } = require('../utils/introspection/SupportsInterface.behavior');
 
-const DEFAULT_ADMIN_ROLE = ethers.ZeroHash;
 const ROLE = ethers.id('ROLE');
 const OTHER_ROLE = ethers.id('OTHER_ROLE');
 
@@ -867,7 +867,6 @@ function shouldBehaveLikeAccessControlDefaultAdminRules() {
 }
 
 module.exports = {
-  DEFAULT_ADMIN_ROLE,
   shouldBehaveLikeAccessControl,
   shouldBehaveLikeAccessControlEnumerable,
   shouldBehaveLikeAccessControlDefaultAdminRules,

diff --git a/test/access/AccessControl.test.js b/test/access/AccessControl.test.js
@@ -1,7 +1,8 @@
 const { ethers } = require('hardhat');
 const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 
-const { DEFAULT_ADMIN_ROLE, shouldBehaveLikeAccessControl } = require('./AccessControl.behavior');
+const { shouldBehaveLikeAccessControl } = require('./AccessControl.behavior');
+const { DEFAULT_ADMIN_ROLE } = require('../helpers/roles');
 
 async function fixture() {
   const [defaultAdmin, ...accounts] = await ethers.getSigners();

diff --git a/test/access/extensions/AccessControlEnumerable.test.js b/test/access/extensions/AccessControlEnumerable.test.js
@@ -1,11 +1,8 @@
 const { ethers } = require('hardhat');
 const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 
-const {
-  DEFAULT_ADMIN_ROLE,
-  shouldBehaveLikeAccessControl,
-  shouldBehaveLikeAccessControlEnumerable,
-} = require('../AccessControl.behavior');
+const { shouldBehaveLikeAccessControl, shouldBehaveLikeAccessControlEnumerable } = require('../AccessControl.behavior');
+const { DEFAULT_ADMIN_ROLE } = require('../../helpers/roles');
 
 async function fixture() {
   const [defaultAdmin, ...accounts] = await ethers.getSigners();

diff --git a/test/governance/TimelockController.test.js b/test/governance/TimelockController.test.js
@@ -5,17 +5,14 @@ const { PANIC_CODES } = require('@nomicfoundation/hardhat-chai-matchers/panic');
 
 const { GovernorHelper } = require('../helpers/governance');
 const { OperationState } = require('../helpers/enums');
+const { DEFAULT_ADMIN_ROLE, PROPOSER_ROLE, EXECUTOR_ROLE, CANCELLER_ROLE } = require('../helpers/roles');
 const time = require('../helpers/time');
 
 const { shouldSupportInterfaces } = require('../utils/introspection/SupportsInterface.behavior');
 
 const salt = '0x025e7b0be353a74631ad648c667493c0e1cd31caa4cc2d3520fdc171ea0cc726'; // a random value
 
 const MINDELAY = time.duration.days(1);
-const DEFAULT_ADMIN_ROLE = ethers.ZeroHash;
-const PROPOSER_ROLE = ethers.id('PROPOSER_ROLE');
-const EXECUTOR_ROLE = ethers.id('EXECUTOR_ROLE');
-const CANCELLER_ROLE = ethers.id('CANCELLER_ROLE');
 
 const getAddress = obj => obj.address ?? obj.target ?? obj;
 

diff --git a/test/governance/extensions/GovernorStorage.test.js b/test/governance/extensions/GovernorStorage.test.js
@@ -6,17 +6,13 @@ const { PANIC_CODES } = require('@nomicfoundation/hardhat-chai-matchers/panic');
 
 const { GovernorHelper, timelockSalt } = require('../../helpers/governance');
 const { VoteType } = require('../../helpers/enums');
+const { DEFAULT_ADMIN_ROLE, PROPOSER_ROLE, EXECUTOR_ROLE, CANCELLER_ROLE } = require('../../helpers/roles');
 
 const TOKENS = [
   { Token: '$ERC20Votes', mode: 'blocknumber' },
   { Token: '$ERC20VotesTimestampMock', mode: 'timestamp' },
 ];
 
-const DEFAULT_ADMIN_ROLE = ethers.ZeroHash;
-const PROPOSER_ROLE = ethers.id('PROPOSER_ROLE');
-const EXECUTOR_ROLE = ethers.id('EXECUTOR_ROLE');
-const CANCELLER_ROLE = ethers.id('CANCELLER_ROLE');
-
 const name = 'OZ-Governor';
 const version = '1';
 const tokenName = 'MockToken';

diff --git a/test/governance/extensions/GovernorSuperQuorum.test.js b/test/governance/extensions/GovernorSuperQuorum.test.js
@@ -4,18 +4,14 @@ const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 
 const { GovernorHelper } = require('../../helpers/governance');
 const { ProposalState, VoteType } = require('../../helpers/enums');
+const { DEFAULT_ADMIN_ROLE, PROPOSER_ROLE, EXECUTOR_ROLE, CANCELLER_ROLE } = require('../../helpers/roles');
 const time = require('../../helpers/time');
 
 const TOKENS = [
   { Token: '$ERC20Votes', mode: 'blocknumber' },
   { Token: '$ERC20VotesTimestampMock', mode: 'timestamp' },
 ];
 
-const DEFAULT_ADMIN_ROLE = ethers.ZeroHash;
-const PROPOSER_ROLE = ethers.id('PROPOSER_ROLE');
-const EXECUTOR_ROLE = ethers.id('EXECUTOR_ROLE');
-const CANCELLER_ROLE = ethers.id('CANCELLER_ROLE');
-
 const name = 'OZ-Governor';
 const version = '1';
 const tokenName = 'MockToken';

diff --git a/test/governance/extensions/GovernorTimelockControl.test.js b/test/governance/extensions/GovernorTimelockControl.test.js
@@ -6,18 +6,14 @@ const { PANIC_CODES } = require('@nomicfoundation/hardhat-chai-matchers/panic');
 
 const { GovernorHelper, timelockSalt } = require('../../helpers/governance');
 const { OperationState, ProposalState, VoteType } = require('../../helpers/enums');
+const { DEFAULT_ADMIN_ROLE, PROPOSER_ROLE, EXECUTOR_ROLE, CANCELLER_ROLE } = require('../../helpers/roles');
 const time = require('../../helpers/time');
 
 const TOKENS = [
   { Token: '$ERC20Votes', mode: 'blocknumber' },
   { Token: '$ERC20VotesTimestampMock', mode: 'timestamp' },
 ];
 
-const DEFAULT_ADMIN_ROLE = ethers.ZeroHash;
-const PROPOSER_ROLE = ethers.id('PROPOSER_ROLE');
-const EXECUTOR_ROLE = ethers.id('EXECUTOR_ROLE');
-const CANCELLER_ROLE = ethers.id('CANCELLER_ROLE');
-
 const name = 'OZ-Governor';
 const version = '1';
 const tokenName = 'MockToken';

diff --git a/test/helpers/roles.js b/test/helpers/roles.js
@@ -0,0 +1,13 @@
+const { ethers } = require('hardhat');
+
+const DEFAULT_ADMIN_ROLE = ethers.ZeroHash;
+const PROPOSER_ROLE = ethers.id('PROPOSER_ROLE');
+const EXECUTOR_ROLE = ethers.id('EXECUTOR_ROLE');
+const CANCELLER_ROLE = ethers.id('CANCELLER_ROLE');
+
+module.exports = {
+  DEFAULT_ADMIN_ROLE,
+  PROPOSER_ROLE,
+  EXECUTOR_ROLE,
+  CANCELLER_ROLE,
+};