use hardhat ^v2.22.3 to fix Invalid Chai property: revertedWith

clrfund · May 16, 2024 · bb48206 · bb48206
1 parent d8cd50c
commit bb48206
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 367 deletions.
diff --git a/contracts/package.json b/contracts/package.json
@@ -36,7 +36,7 @@
     "@types/mocha": "^10.0.6",
     "chai": "4",
     "ethers": "^6.12.1",
-    "hardhat": "^2.19.4",
+    "hardhat": "^2.22.3",
     "hardhat-contract-sizer": "^2.10.0",
     "hardhat-gas-reporter": "^1.0.8",
     "ipfs-only-hash": "^2.0.1",

diff --git a/contracts/tests/maciFactory.ts b/contracts/tests/maciFactory.ts
@@ -89,7 +89,10 @@ describe('MACI factory', () => {
       coordinatorMaciFactory.setMaciParameters(
         ...maciParameters.asContractParam()
       )
-    ).to.be.revertedWith('Ownable: caller is not the owner')
+    ).to.be.revertedWithCustomError(
+      coordinatorMaciFactory,
+      'OwnableUnauthorizedAccount'
+    )
   })
 
   it('deploys MACI', async () => {

diff --git a/contracts/tests/recipientRegistry.ts b/contracts/tests/recipientRegistry.ts
@@ -154,7 +154,10 @@ describe('Simple Recipient Registry', async () => {
       const registryAsRecipient = registry.connect(recipient) as Contract
       await expect(
         registryAsRecipient.addRecipient(recipientAddress, metadata)
-      ).to.be.revertedWith('Ownable: caller is not the owner')
+      ).to.be.revertedWithCustomError(
+        registryAsRecipient,
+        'OwnableUnauthorizedAccount'
+      )
     })
 
     it('should not accept zero-address as recipient address', async () => {
@@ -218,7 +221,10 @@ describe('Simple Recipient Registry', async () => {
       const registryAsRecipient = registry.connect(recipient) as Contract
       await expect(
         registryAsRecipient.removeRecipient(recipientId)
-      ).to.be.revertedWith('Ownable: caller is not the owner')
+      ).to.be.revertedWithCustomError(
+        registryAsRecipient,
+        'OwnableUnauthorizedAccount'
+      )
     })
 
     it('reverts if recipient is not in registry', async () => {
@@ -762,7 +768,7 @@ describe('Optimistic recipient registry', () => {
           recipientId,
           requester.address
         )
-      ).to.be.revertedWith('Ownable: caller is not the owner')
+      ).to.be.revertedWithCustomError(registry, 'OwnableUnauthorizedAccount')
     })
 
     it('should not allow to challenge resolved request', async () => {

diff --git a/contracts/tests/round.ts b/contracts/tests/round.ts
@@ -249,7 +249,7 @@ describe('Funding Round', () => {
     it('requires approval', async () => {
       await expect(
         fundingRoundAsContributor.contribute(userPubKey, contributionAmount)
-      ).to.be.revertedWith('ERC20: insufficient allowance')
+      ).to.be.revertedWithCustomError(token, 'ERC20InsufficientAllowance')
     })
 
     it('rejects contributions from unverified users', async () => {
@@ -750,7 +750,10 @@ describe('Funding Round', () => {
           newResultCommitment,
           perVOSpentVoiceCreditsHash
         )
-      ).to.be.revertedWith('Ownable: caller is not the owner')
+      ).to.be.revertedWithCustomError(
+        fundingRoundAsCoordinator,
+        'OwnableUnauthorizedAccount'
+      )
     })
   })
 
@@ -811,8 +814,11 @@ describe('Funding Round', () => {
       const fundingRoundAsCoordinator = fundingRound.connect(
         coordinator
       ) as Contract
-      await expect(fundingRoundAsCoordinator.cancel()).to.be.revertedWith(
-        'Ownable: caller is not the owner'
+      await expect(
+        fundingRoundAsCoordinator.cancel()
+      ).to.be.revertedWithCustomError(
+        fundingRoundAsCoordinator,
+        'OwnableUnauthorizedAccount'
       )
     })
   })

diff --git a/contracts/tests/userRegistry.ts b/contracts/tests/userRegistry.ts
@@ -44,8 +44,11 @@ describe('Simple User Registry', () => {
 
     it('allows only owner to add users', async () => {
       const registryAsUser = registry.connect(user) as Contract
-      await expect(registryAsUser.addUser(user.address)).to.be.revertedWith(
-        'Ownable: caller is not the owner'
+      await expect(
+        registryAsUser.addUser(user.address)
+      ).to.be.revertedWithCustomError(
+        registryAsUser,
+        'OwnableUnauthorizedAccount'
       )
     })
 
@@ -66,8 +69,11 @@ describe('Simple User Registry', () => {
     it('allows only owner to remove users', async () => {
       await registry.addUser(user.address)
       const registryAsUser = registry.connect(user) as Contract
-      await expect(registryAsUser.removeUser(user.address)).to.be.revertedWith(
-        'Ownable: caller is not the owner'
+      await expect(
+        registryAsUser.removeUser(user.address)
+      ).to.be.revertedWithCustomError(
+        registryAsUser,
+        'OwnableUnauthorizedAccount'
       )
     })
   })

diff --git a/contracts/tests/userRegistryMerkle.ts b/contracts/tests/userRegistryMerkle.ts
@@ -39,7 +39,10 @@ describe('Merkle User Registry', () => {
     const registryAsUser = registry.connect(signers[user1.address]) as Contract
     await expect(
       registryAsUser.setMerkleRoot(randomBytes(32), 'non owner')
-    ).to.be.revertedWith('Ownable: caller is not the owner')
+    ).to.be.revertedWithCustomError(
+      registryAsUser,
+      'OwnableUnauthorizedAccount'
+    )
   })
 
   describe('registration', () => {

diff --git a/contracts/tests/userRegistrySemaphore.ts b/contracts/tests/userRegistrySemaphore.ts
@@ -66,7 +66,10 @@ describe('Semaphore User Registry', () => {
       const registryAsUser = registry.connect(user) as Contract
       await expect(
         registryAsUser.addUser(user.address, semaphoreId)
-      ).to.be.revertedWith('Ownable: caller is not the owner')
+      ).to.be.revertedWithCustomError(
+        registryAsUser,
+        'OwnableUnauthorizedAccount'
+      )
     })
 
     it('allows owner to remove user', async () => {
@@ -88,8 +91,11 @@ describe('Semaphore User Registry', () => {
       const semaphoreId = 1
       await registry.addUser(user.address, semaphoreId)
       const registryAsUser = registry.connect(user) as Contract
-      await expect(registryAsUser.removeUser(user.address)).to.be.revertedWith(
-        'Ownable: caller is not the owner'
+      await expect(
+        registryAsUser.removeUser(user.address)
+      ).to.be.revertedWithCustomError(
+        registryAsUser,
+        'OwnableUnauthorizedAccount'
       )
     })
 

diff --git a/contracts/utils/testutils.ts b/contracts/utils/testutils.ts
@@ -9,6 +9,7 @@ import { EContracts } from './types'
 import { Libraries } from 'hardhat/types'
 import { MACIFactory, VkRegistry } from '../typechain-types'
 import { ZERO_ADDRESS } from './constants'
+import { EMode } from 'maci-contracts'
 
 /**
  * Deploy a mock contract with the given contract name
@@ -236,7 +237,6 @@ export async function deployTestFundingRound(
       factories.pollFactory,
       factories.messageProcessorFactory,
       factories.tallyFactory,
-      factories.subsidyFactory,
       fundingRound.target,
       fundingRound.target,
       topupToken.target,
@@ -254,8 +254,7 @@ export async function deployTestFundingRound(
     coordinatorPubKey.asContractParam(),
     mockVerifier.target,
     vkRegistry.target,
-    // pass false to not deploy the subsidy contract
-    false
+    EMode.QV
   )
   const pollAddr = await getEventArg(
     deployPollTx,