custom error refactor

Signed-off-by: Pascal Marco Caversaccio <pascal.caversaccio@hotmail.ch>

contracts/Create.sol

@@ -44,7 +44,8 @@ contract Create {
         public
         returns (address newContract)
     {
-        if (address(this).balance < amount) revert InsufficientBalance(address(this));
+        if (address(this).balance < amount)
+            revert InsufficientBalance(address(this));
         if (bytecode.length == 0) revert ZeroBytecodeLength(address(this));
         // solhint-disable-next-line no-inline-assembly
         assembly ("memory-safe") {

hardhat.config.js

@@ -2,6 +2,7 @@
  * @type import('hardhat/config').HardhatUserConfig
  */
 require("@nomiclabs/hardhat-truffle5");
+require("@nomicfoundation/hardhat-chai-matchers");
 
 module.exports = {
   solidity: {

package.json

@@ -31,7 +31,7 @@
     "@ethereumjs/tx": "^3.5.2",
     "@ethersproject/abi": "^5.6.4",
     "@ethersproject/providers": "^5.6.8",
-    "@nomicfoundation/hardhat-chai-matchers": "^1.0.0",
+    "@nomicfoundation/hardhat-chai-matchers": "^1.0.1",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.2",
     "@nomicfoundation/hardhat-toolbox": "^1.0.1",
     "@nomiclabs/hardhat-ethers": "^2.1.0",

test/Create.test.js

@@ -3,7 +3,6 @@ const { balance, BN, ether, send } = require("@openzeppelin/test-helpers");
 const { expect } = require("chai");
 const { Address } = require("ethereumjs-util");
 const { web3 } = require("hardhat");
-const { expectRevertCustomError } = require("./customError");
 
 const Create = artifacts.require("Create");
 const ERC20Mock = artifacts.require("ERC20Mock");
@@ -156,24 +155,21 @@ contract("Create", function (accounts) {
     });
 
     it("fails deploying a contract with invalid constructor bytecode", async function () {
-      await expectRevertCustomError(
-        this.factory.deploy(0, 0x1),
-        `Failed("${this.factory.address}")`
-      );
+      expect(await this.factory.deploy(0, 0x1))
+        .to.be.expectRevertCustomError(this.factory, "Failed")
+        .withArgs(this.factory.address);
     });
 
     it("fails deploying a contract if the bytecode length is zero", async function () {
-      await expectRevertCustomError(
-        this.factory.deploy(0, "0x"),
-        `ZeroBytecodeLength("${this.factory.address}")`
-      );
+      expect(await this.factory.deploy(0, "0x"))
+        .to.be.expectRevertCustomError(this.factory, "ZeroBytecodeLength")
+        .withArgs(this.factory.address);
     });
 
     it("fails deploying a contract if factory contract does not have sufficient balance", async function () {
-      await expectRevertCustomError(
-        this.factory.deploy(1, constructorByteCode),
-        `InsufficientBalance("${this.factory.address}")`
-      );
+      expect(await this.factory.deploy(1, constructorByteCode))
+        .to.be.expectRevertCustomError(this.factory, "InsufficientBalance")
+        .withArgs(this.factory.address);
     });
   });
 });