Use contracts exposed with imports to remove mocks (#178)

Author: Amxx

contracts/mocks/Create2Mock.sol

@@ -2,7 +2,10 @@
 
 pragma solidity ^0.8.20;
 
-import {UpgradeableBeacon} from "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol";
 import {ECDSAOwnedDKIMRegistry} from "@zk-email/email-tx-builder/src/utils/ECDSAOwnedDKIMRegistry.sol";
+import {UpgradeableBeacon} from "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol";
+import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
+import {ERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
+import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";
 import {ERC1271WalletMock} from "@openzeppelin/contracts/mocks/ERC1271WalletMock.sol";
 import {CallReceiverMock} from "@openzeppelin/contracts/mocks/CallReceiverMock.sol";

contracts/mocks/ERC1155Mock.sol

@@ -51,6 +51,10 @@ module.exports = {
       hardfork: argv.hardfork,
     },
   },
+  exposed: {
+    imports: true,
+    initializers: true,
+  },
   gasReporter: {
     enabled: argv.gas,
     showMethodSig: true,

contracts/mocks/ERC20Mock.sol

@@ -93,7 +93,7 @@ function shouldBehaveLikeAccountHolder() {
       const data = '0x12345678';
 
       beforeEach(async function () {
-        this.token = await ethers.deployContract('$ERC1155Mock', ['https://somedomain.com/{id}.json']);
+        this.token = await ethers.deployContract('$ERC1155', ['https://somedomain.com/{id}.json']);
         await this.token.$_mintBatch(this.other, ids, values, '0x');
       });
 
@@ -130,7 +130,7 @@ function shouldBehaveLikeAccountHolder() {
       const tokenId = 1n;
 
       beforeEach(async function () {
-        this.token = await ethers.deployContract('$ERC721Mock', ['Some NFT', 'SNFT']);
+        this.token = await ethers.deployContract('$ERC721', ['Some NFT', 'SNFT']);
         await this.token.$_mint(this.other, tokenId);
       });
 

contracts/mocks/ERC721Mock.sol

@@ -17,7 +17,7 @@ async function fixture() {
   // EOAs and environment
   const [admin, receiver, other] = await ethers.getSigners();
   const target = await ethers.deployContract('CallReceiverMock');
-  const token = await ethers.deployContract('$ERC20Mock', ['Name', 'Symbol']);
+  const token = await ethers.deployContract('$ERC20', ['Name', 'Symbol']);
 
   // signers
   const accountSigner = ethers.Wallet.createRandom();

contracts/mocks/import.sol

@@ -17,7 +17,7 @@ async function fixture() {
   // EOAs and environment
   const [admin, receiver, guarantor, other] = await ethers.getSigners();
   const target = await ethers.deployContract('CallReceiverMock');
-  const token = await ethers.deployContract('$ERC20Mock', ['Name', 'Symbol']);
+  const token = await ethers.deployContract('$ERC20', ['Name', 'Symbol']);
 
   // signers
   const accountSigner = ethers.Wallet.createRandom();

hardhat.config.js

@@ -15,7 +15,7 @@ for (const [name, opts] of Object.entries({
     // EOAs and environment
     const [admin, receiver, other] = await ethers.getSigners();
     const target = await ethers.deployContract('CallReceiverMock');
-    const token = await ethers.deployContract('$ERC721Mock', ['Some NFT', 'SNFT']);
+    const token = await ethers.deployContract('$ERC721Enumerable', ['Some NFT', 'SNFT']);
 
     // signers
     const accountSigner = ethers.Wallet.createRandom();