test: fix e2e

thomas-waite · thomas-waite · commit f9384e5a5352 · 2022-04-26T20:14:10.000+01:00
diff --git a/proposals/dao/fip_82.ts b/proposals/dao/fip_82.ts
@@ -144,27 +144,18 @@ const validate: ValidateUpgradeFunc = async (addresses, oldContracts, contracts,
   // 1. Validate PodAdminGateway has PROPOSER role on TribalCouncil and Protocol Pod
   ///////////////  POD ADMIN GATEWAY  //////////////////////
   const tribalCouncilTimelock = contracts.tribalCouncilTimelock;
-  const gatewayIsCouncilProposer = await tribalCouncilTimelock.hasRole(
-    ethers.utils.id('PROPOSER_ROLE'),
-    addresses.podAdminGateway
-  );
-  expect(gatewayIsCouncilProposer).to.be.true;
+  expect(await tribalCouncilTimelock.hasRole(ethers.utils.id('PROPOSER_ROLE'), addresses.podAdminGateway)).to.be.false;
+  expect(await tribalCouncilTimelock.hasRole(ethers.utils.id('CANCELLER_ROLE'), addresses.podAdminGateway)).to.be.true;
 
   ///////////////   TRIBAL COUNCIL  //////////////////
   const councilPodAdmin = await podFactory.getPodAdmin(tribalCouncilPodId);
   expect(councilPodAdmin).to.equal(addresses.podAdminGateway);
 
-  const councilSafeIsProposer = await tribalCouncilTimelock.hasRole(
-    ethers.utils.id('PROPOSER_ROLE'),
-    tribalCouncilSafeAddress
-  );
-  expect(councilSafeIsProposer).to.be.true;
+  expect(await tribalCouncilTimelock.hasRole(ethers.utils.id('PROPOSER_ROLE'), tribalCouncilSafeAddress)).to.be.true;
+  expect(await tribalCouncilTimelock.hasRole(ethers.utils.id('EXECUTOR_ROLE'), tribalCouncilSafeAddress)).to.be.true;
+  expect(await tribalCouncilTimelock.hasRole(ethers.utils.id('CANCELLER_ROLE'), tribalCouncilSafeAddress)).to.be.true;
 
-  const podExecutorIsExecutor = await tribalCouncilTimelock.hasRole(
-    ethers.utils.id('EXECUTOR_ROLE'),
-    addresses.podExecutor
-  );
-  expect(podExecutorIsExecutor).to.be.true;
+  expect(await tribalCouncilTimelock.hasRole(ethers.utils.id('EXECUTOR_ROLE'), addresses.podExecutor)).to.be.true;
 
   const councilMembershipLocked = await podFactory.getIsMembershipTransferLocked(tribalCouncilPodId);
   expect(councilMembershipLocked).to.be.true;
