@gooddollar/goodprotocol 2.0.21 → 2.0.22-beta.0

package/test/identity/IdentityV2.test.ts

@@ -113,14 +113,14 @@ describe("Identity", () => {
     let whitelisted = signers[1];
     await expect(
       identity.connect(signers[2]).addWhitelisted(whitelisted.address)
-    ).revertedWith("AccessControl: account");
+    ).revertedWith(/AccessControl: account/);
   });
 
   it("should revert when non admin tries to add blacklist", async () => {
     let blacklisted = signers[1];
     await expect(
       identity.connect(signers[2]).addBlacklisted(blacklisted.address)
-    ).revertedWith("AccessControl: account");
+    ).revertedWith(/AccessControl: account/);
   });
 
   it("should revert when non admin tries to set the authentication period", async () => {
@@ -150,7 +150,7 @@ describe("Identity", () => {
     let authuser = signers[0].address;
     await expect(
       identity.connect(signers[2]).authenticate(authuser)
-    ).revertedWith("AccessControl: account");
+    ).revertedWith(/AccessControl: account/);
   });
 
   it("should authenticate the user with the correct timestamp", async () => {
@@ -225,13 +225,13 @@ describe("Identity", () => {
 
     await expect(
       identity.addWhitelistedWithDID(whitelisted2.address, "testString")
-    ).revertedWith("DID already registered");
+    ).revertedWith(/DID already registered/);
   });
 
   it("should not allow adding non contract to contracts", async () => {
     let outsider = signers[0];
     await expect(identity.addContract(outsider.address)).revertedWith(
-      "Given address is not a contract"
+      /Given address is not a contract/
     );
   });
 
@@ -330,11 +330,11 @@ describe("Identity", () => {
           "0x",
           await ethers.provider.getBlockNumber()
         )
-    ).revertedWith("invalid deadline");
+    ).revertedWith(/invalid deadline/);
 
     await expect(
       identity.connect(whitelisted).connectAccount(toconnect.address, "0x", 0)
-    ).revertedWith("invalid deadline");
+    ).revertedWith(/invalid deadline/);
   });
 
   it("should not allow to replay signature", async () => {
@@ -353,7 +353,7 @@ describe("Identity", () => {
           signed,
           (await ethers.provider.getBlockNumber()) + 10
         )
-    ).revertedWith("invalid signature");
+    ).revertedWith(/invalid signature/);
   });
 
   it("should not allow to connect account already whitelisted", async () => {
@@ -366,7 +366,7 @@ describe("Identity", () => {
       identity
         .connect(whitelisted)
         .connectAccount(signers[2].address, "0x", 20000000)
-    ).revertedWith("invalid account");
+    ).revertedWith(/invalid account/);
   });
 
   it("should allow to disconnect account by owner or connected", async () => {
@@ -391,7 +391,7 @@ describe("Identity", () => {
     const connected = signers[10];
     const whitelisted = signers[1];
     await expect(identity.disconnectAccount(connected.address)).revertedWith(
-      "unauthorized"
+      /unauthorized/
     );
   });
 
@@ -406,7 +406,7 @@ describe("Identity", () => {
       identity
         .connect(signers[2])
         .connectAccount(connected.address, "0x", 200000)
-    ).revertedWith("already connected");
+    ).revertedWith(/already connected/);
   });
 
   it("should return same root for multiple connected accounts", async () => {
@@ -490,7 +490,7 @@ describe("Identity", () => {
       newid
         .connect(signers[1])
         ["setDID(address,string)"](signers[1].address, "testolddid")
-    ).revertedWith("DID already registered oldIdentity");
+    ).revertedWith(/DID already registered oldIdentity/);
   });
 
   it("should set did if set in oldidentity by same owner", async () => {

package/test/invite/InvitesV1.test.ts

@@ -101,7 +101,7 @@ describe("InvitesV1", () => {
           ethers.utils.hexZeroPad("0xfa", 32),
           ethers.utils.hexZeroPad("0x01", 32)
         )
-    ).to.revertedWith("user already joined");
+    ).to.revertedWith(/user already joined/);
   });
 
   it("should not allow code reuse", async () => {
@@ -110,7 +110,7 @@ describe("InvitesV1", () => {
       invites
         .connect(inviter2)
         .join(ethers.utils.hexZeroPad("0xfa", 32), ethers.constants.HashZero)
-    ).to.revertedWith("invite code already in use");
+    ).to.revertedWith(/invite code already in use/);
   });
 
   it("should mark inviter", async () => {
@@ -129,7 +129,7 @@ describe("InvitesV1", () => {
   it("should not pay bounty for non whitelisted invitee", async () => {
     await expect(
       invites.connect(inviter1).bountyFor(invitee1.address)
-    ).to.revertedWith("user not elligble for bounty yet");
+    ).to.revertedWith(/user not elligble for bounty yet/);
   });
 
   it("should not pay bounty for non whitelisted inviter", async () => {
@@ -138,7 +138,7 @@ describe("InvitesV1", () => {
     expect(await invites.canCollectBountyFor(invitee1.address)).to.be.false;
     await expect(
       invites.connect(inviter1).bountyFor(invitee1.address)
-    ).to.revertedWith("user not elligble for bounty yet");
+    ).to.revertedWith(/user not elligble for bounty yet/);
   });
 
   it("should pay bounty for whitelisted invitee and inviter", async () => {
@@ -200,7 +200,7 @@ describe("InvitesV1", () => {
   it("should not pay bounty twice", async () => {
     await expect(
       invites.connect(inviter2).bountyFor(invitee1.address)
-    ).to.revertedWith("user not elligble for bounty yet");
+    ).to.revertedWith(/user not elligble for bounty yet/);
   });
 
   it("should not fail in collectBounties for invalid invitees", async () => {
@@ -260,7 +260,7 @@ describe("InvitesV1", () => {
   it("should not set level not by owner", async () => {
     await expect(
       invites.connect(inviter1).setLevel(0, 1, 5, 1)
-    ).to.revertedWith("Only owner or avatar can perform this action");
+    ).to.revertedWith(/Only owner or avatar can perform this action/);
   });
 
   it("should set level by owner", async () => {