@gooddollar/goodprotocol 2.0.21 → 2.0.22-beta.0

package/test/reserve/GoodReserveCDai.uniswap.test.ts

@@ -437,7 +437,7 @@ describe("GoodReserve - buy/sell with any token through uniswap", () => {
         0,
         NULL_ADDRESS
       )
-    ).to.be.revertedWith("ERC20: insufficient allowance");
+    ).to.be.revertedWith(/ERC20: insufficient allowance/);
   });
 
   it("shouldn't be able to sell gd to tokenA through UNISWAP without approve", async () => {

package/test/staking/DonationsStaking.test.ts

@@ -233,7 +233,7 @@ describe("DonationsStaking - DonationStaking contract that receives funds in ETH
 
   it("it should reverted when there is no token to stake", async () => {
     await expect(donationsStaking.stakeDonations()).to.be.revertedWith(
-      "no stakingToken to stake"
+      /no stakingToken to stake/
     );
   });
 
@@ -488,7 +488,7 @@ describe("DonationsStaking - DonationStaking contract that receives funds in ETH
       donationsStaking
         .connect(staker)
         ["setMaxLiquidityPercentageSwap(uint24)"](percentageToSet)
-    ).to.be.revertedWith("only avatar can call this method");
+    ).to.be.revertedWith(/only avatar can call this method/);
     //succeed when avatar
     let encodedData = donationsStaking.interface.encodeFunctionData(
       "setMaxLiquidityPercentageSwap",

package/test/staking/FuseStaking.test.ts

@@ -1,8 +1,8 @@
-import hre, { ethers, network as networkConfig, waffle } from "hardhat";
+import hre, { ethers, network as networkConfig } from "hardhat";
 import { loadFixture } from "@nomicfoundation/hardhat-network-helpers";
 import { FuseStakingV3 } from "../../types";
 import { expect } from "chai";
-import { MockContract } from "ethereum-waffle";
+import * as waffle from "ethereum-waffle";
 import { abi as ubiabi } from "../../artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.json";
 import { BigNumber } from "ethers";
 export const NULL_ADDRESS = "0x0000000000000000000000000000000000000000";
@@ -12,7 +12,7 @@ describe("FuseStakingV3", () => {
   let founder, staker1, staker2;
   let signers;
 
-  let uniswap: MockContract,
+  let uniswap: waffle.MockContract,
     uniswapFactory,
     uniswapPair,
     gdusdcPair,

package/test/staking/GoodAaveStakingFactory.test.ts

@@ -146,7 +146,7 @@ describe("AaveStakingFactory", () => {
         aaveUsdOracle.address,
         [cdai, dai] // violates tokenToDaiSwapPath[0] == _token (cdai != usdc)
       )
-    ).to.be.revertedWith("invalid _tokenToDaiSwapPath");
+    ).to.be.revertedWith(/invalid _tokenToDaiSwapPath/);
     await expect(
       goodAaveStakingV2.init(
         usdc.address,
@@ -160,6 +160,6 @@ describe("AaveStakingFactory", () => {
         aaveUsdOracle.address,
         [usdc.address, cdai] // violates _tokenToDaiSwapPath[] path leading to dai
       )
-    ).to.be.revertedWith("invalid _tokenToDaiSwapPath");
+    ).to.be.revertedWith(/invalid _tokenToDaiSwapPath/);
   });
 });