Simplify role assignment for accounts

NexusMutual · Nov 3, 2022 · 94cc491 · 94cc491
1 parent 28bed7d
commit 94cc491
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 64 deletions.
diff --git a/test/integration/setup.js b/test/integration/setup.js
@@ -35,8 +35,7 @@ async function setup() {
 
   const CoverUtilsLib = await ethers.getContractFactory('CoverUtilsLib');
 
-  const signers = await ethers.getSigners();
-  const ethersAccounts = getAccounts(signers);
+  const ethersAccounts = await getAccounts();
 
   // external
   const WETH9 = await ethers.getContractFactory('WETH9');

diff --git a/test/unit/Assessment/setup.js b/test/unit/Assessment/setup.js
@@ -62,8 +62,7 @@ async function setup() {
   await individualClaims.initialize();
   await yieldTokenIncidents.initialize();
 
-  const signers = await ethers.getSigners();
-  const accounts = getAccounts(signers);
+  const accounts = await getAccounts();
   await master.enrollGovernance(accounts.governanceContracts[0].address);
   for (const member of accounts.members) {
     await master.enrollMember(member.address, 1); // Uses a different role value than IMemberRoles

diff --git a/test/unit/Cover/setup.js b/test/unit/Cover/setup.js
@@ -7,8 +7,7 @@ const { Role } = require('../utils').constants;
 const { hex, zeroPadRight } = require('../utils').helpers;
 
 const getDeployAddressAfter = async txCount => {
-  const signers = await ethers.getSigners();
-  const { defaultSender } = getAccounts(signers);
+  const { defaultSender } = await getAccounts();
   const transactionCount = await defaultSender.getTransactionCount();
   const nextAddress = getContractAddress({
     from: defaultSender.address,
@@ -136,8 +135,7 @@ async function setup() {
   await master.setLatestAddress(hex('TC'), tokenController.address);
   await master.setLatestAddress(hex('MC'), mcr.address);
 
-  const signers = await ethers.getSigners();
-  const accounts = getAccounts(signers);
+  const accounts = await getAccounts();
 
   for (const member of accounts.members) {
     await master.enrollMember(member.address, Role.Member);

diff --git a/test/unit/CoverMigrator/setup.js b/test/unit/CoverMigrator/setup.js
@@ -33,8 +33,7 @@ async function setup() {
     await tx.wait();
   }
 
-  const signers = await ethers.getSigners();
-  const accounts = getAccounts(signers);
+  const accounts = await getAccounts();
   await master.enrollGovernance(accounts.governanceContracts[0].address);
 
   this.accounts = accounts;

diff --git a/test/unit/IndividualClaims/setup.js b/test/unit/IndividualClaims/setup.js
@@ -72,8 +72,7 @@ async function setup() {
   await individualClaims.changeDependentContractAddress();
   await individualClaims.initialize();
 
-  const signers = await ethers.getSigners();
-  const accounts = getAccounts(signers);
+  const accounts = await getAccounts();
   await master.enrollGovernance(accounts.governanceContracts[0].address);
   for (const member of accounts.members) {
     await memberRoles.setRole(member.address, 2);

diff --git a/test/unit/MemberRoles/setup.js b/test/unit/MemberRoles/setup.js
@@ -63,8 +63,7 @@ async function setup() {
   ]);
   await Promise.all(masterInitTxs.map(x => x.wait()));
 
-  const signers = await ethers.getSigners();
-  const accounts = getAccounts(signers);
+  const accounts = await getAccounts();
   await master.enrollGovernance(accounts.governanceContracts[0].address);
 
   await memberRoles.changeMasterAddress(master.address);

diff --git a/test/unit/StakingPool/setup.js b/test/unit/StakingPool/setup.js
@@ -45,8 +45,7 @@ async function setup() {
   await mcr.deployed();
   await mcr.setMCR(parseEther('600000'));
 
-  const signers = await ethers.getSigners();
-  const accounts = getAccounts(signers);
+  const accounts = await getAccounts();
 
   const cover = await SPCoverProducts.deploy();
   await cover.deployed();

diff --git a/test/unit/SwapOperator/setup.js b/test/unit/SwapOperator/setup.js
@@ -14,8 +14,7 @@ const instances = {};
 async function setup() {
   const [owner, governance] = await ethers.getSigners();
 
-  const signers = await ethers.getSigners();
-  let accounts = getAccounts(signers);
+  let accounts = await getAccounts();
 
   const MasterMock = await ethers.getContractFactory('MasterMock');
   const Pool = await ethers.getContractFactory('Pool');

diff --git a/test/unit/TokenController/setup.js b/test/unit/TokenController/setup.js
@@ -14,8 +14,7 @@ async function setup() {
   const master = await MasterMock.deploy();
   await master.deployed();
 
-  const signers = await ethers.getSigners();
-  const accounts = getAccounts(signers);
+  const accounts = await getAccounts();
   const { internalContracts, members } = accounts;
   const internal = internalContracts[0];
 

diff --git a/test/unit/YieldTokenIncidents/setup.js b/test/unit/YieldTokenIncidents/setup.js
@@ -85,8 +85,7 @@ async function setup() {
   await yieldTokenIncidents.changeDependentContractAddress();
   await yieldTokenIncidents.initialize();
 
-  const signers = await ethers.getSigners();
-  const accounts = getAccounts(signers);
+  const accounts = await getAccounts();
   await master.enrollGovernance(accounts.governanceContracts[0].address);
   await memberRoles.setRole(accounts.advisoryBoardMembers[0].address, 1);
   await memberRoles.setRole(accounts.advisoryBoardMembers[1].address, 1);

diff --git a/test/utils/accounts.js b/test/utils/accounts.js
@@ -1,49 +1,26 @@
-const { accounts } = require('hardhat');
+const { accounts, ethers } = require('hardhat');
 
-const [defaultSender] = accounts;
-const nonMembers = accounts.slice(1, 5);
-const members = accounts.slice(5, 10);
-const advisoryBoardMembers = accounts.slice(10, 15);
-const internalContracts = accounts.slice(15, 20);
-const nonInternalContracts = accounts.slice(20, 25);
-const governanceContracts = accounts.slice(25, 30);
-const stakingPoolManagers = accounts.slice(30, 35);
-const generalPurpose = accounts.slice(35); // 65 general purpose addresses
+const assingRoles = accounts => ({
+  defaultSender: accounts[0],
+  nonMembers: accounts.slice(1, 5),
+  members: accounts.slice(5, 10),
+  advisoryBoardMembers: accounts.slice(10, 15),
+  internalContracts: accounts.slice(15, 20),
+  nonInternalContracts: accounts.slice(20, 25),
+  governanceContracts: accounts.slice(25, 30),
+  stakingPoolManagers: accounts.slice(30, 35),
+  emergencyAdmin: accounts[35],
+  generalPurpose: accounts.slice(36),
+});
 
-const getAccounts = accounts => {
-  const [defaultSender] = accounts;
-  const nonMembers = accounts.slice(1, 5);
-  const members = accounts.slice(5, 10);
-  const advisoryBoardMembers = accounts.slice(10, 15);
-  const internalContracts = accounts.slice(15, 20);
-  const nonInternalContracts = accounts.slice(20, 25);
-  const governanceContracts = accounts.slice(25, 30);
-  const stakingPoolManagers = accounts.slice(30, 35);
-  const emergencyAdmin = accounts[35];
-  const generalPurpose = accounts.slice(36); // 65 general purpose addresses
-  return {
-    defaultSender,
-    nonMembers,
-    members,
-    advisoryBoardMembers,
-    internalContracts,
-    nonInternalContracts,
-    governanceContracts,
-    stakingPoolManagers,
-    generalPurpose,
-    emergencyAdmin,
-  };
+const getAccounts = async () => {
+  const accounts = await ethers.getSigners();
+  return assingRoles(accounts);
 };
 
+const accountRoles = assingRoles(accounts);
+
 module.exports = {
   getAccounts,
-  defaultSender,
-  nonMembers,
-  members,
-  advisoryBoardMembers,
-  internalContracts,
-  nonInternalContracts,
-  governanceContracts,
-  stakingPoolManagers,
-  generalPurpose,
+  ...accountRoles,
 };