fix tests

Author: arr00

test/governance/Governor.test.js

@@ -40,7 +40,7 @@ async function deployToken(contractName) {
   }
 }
 
-describe('Governor', function () {
+describe.only('Governor', function () {
   for (const { Token, mode } of TOKENS) {
     const fixture = async () => {
       const [owner, proposer, voter1, voter2, voter3, voter4, userEOA] = await ethers.getSigners();
@@ -625,7 +625,7 @@ describe('Governor', function () {
 
             await expect(this.helper.connect(this.owner).cancel('external'))
               .to.be.revertedWithCustomError(this.mock, 'GovernorUnableToCancel')
-              .withArgs(this.proposal.id, this.owner.address);
+              .withArgs(this.proposal.id, this.owner);
           });
 
           it('after vote started', async function () {
@@ -634,7 +634,7 @@ describe('Governor', function () {
 
             await expect(this.helper.cancel('external'))
               .to.be.revertedWithCustomError(this.mock, 'GovernorUnableToCancel')
-              .withArgs(this.proposal.id, this.owner.address);
+              .withArgs(this.proposal.id, this.owner);
           });
 
           it('after vote', async function () {
@@ -644,7 +644,7 @@ describe('Governor', function () {
 
             await expect(this.helper.cancel('external'))
               .to.be.revertedWithCustomError(this.mock, 'GovernorUnableToCancel')
-              .withArgs(this.proposal.id, this.voter1.address);
+              .withArgs(this.proposal.id, this.voter1);
           });
 
           it('after deadline', async function () {
@@ -655,7 +655,7 @@ describe('Governor', function () {
 
             await expect(this.helper.cancel('external'))
               .to.be.revertedWithCustomError(this.mock, 'GovernorUnableToCancel')
-              .withArgs(this.proposal.id, this.voter1.address);
+              .withArgs(this.proposal.id, this.voter1);
           });
 
           it('after execution', async function () {
@@ -667,7 +667,7 @@ describe('Governor', function () {
 
             await expect(this.helper.cancel('external'))
               .to.be.revertedWithCustomError(this.mock, 'GovernorUnableToCancel')
-              .withArgs(this.proposal.id, this.voter1.address);
+              .withArgs(this.proposal.id, this.voter1);
           });
         });
       });

test/governance/extensions/GovernorProposalGuardian.test.js

@@ -104,12 +104,8 @@ describe('GovernorProposalGuardian', function () {
 
         it('from proposer when proposal guardian is non-zero', async function () {
           await expect(this.helper.connect(this.proposer).cancel())
-            .to.be.revertedWithCustomError(this.mock, 'GovernorUnexpectedProposalState')
-            .withArgs(
-              this.proposal.id,
-              ProposalState.Active,
-              GovernorHelper.proposalStatesToBitMap([ProposalState.Pending]),
-            );
+            .to.be.revertedWithCustomError(this.mock, 'GovernorUnableToCancel')
+            .withArgs(this.proposal.id, this.proposer);
         });
 
         it('from proposer when proposal guardian is zero', async function () {