Merge pull request #72 from marc-aurele-besner/dev

Fix small issue in deployment and foundry test

package.json

@@ -1,6 +1,6 @@
 {
     "name": "hardhat-awesome-cli",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "description": "Hardhat made awesome with a flexible CLI to help run test, deploy and more.",
     "repository": "https://github.com/marc-aurele-besner/hardhat-awesome-cli.git",
     "author": "Marc-Aurele Besner <82244926+marc-aurele-besner@users.noreply.github.com>",

src/buildFoundrySetting.ts

@@ -7,7 +7,7 @@ const buildFoundrySetting = async () => {
     if (!fs.existsSync('foundry.toml')) {
         fs.writeFileSync(
             'foundry.toml',
-            `[default]
+            `[profile.default]
 src = 'contracts/test'                                        # the source directory
 test = 'contracts/test'                                       # the test directory
 out = 'artifacts/contracts'                                   # the output directory (for artifacts)
@@ -54,6 +54,10 @@ block_difficulty = 0                                          # the value of blo
             if (!fs.existsSync('contracts/test/utils')) {
                 fs.mkdirSync('contracts/test/utils')
             }
+        } else {
+            if (!fs.existsSync('contracts/test/utils')) {
+                fs.mkdirSync('contracts/test/utils')
+            }
         }
     } else {
         fs.mkdirSync('contracts')

src/mockContracts/scripts/deploy-Mock-ERC1155Upgradeable.ts

@@ -4,7 +4,7 @@ import { addressBook, ethers, network } from 'hardhat'
 async function main() {
     const [deployer] = await ethers.getSigners()
 
-    const MockERC1155Upgradeable = await ethers.getContractFactory('MockERC1155')
+    const MockERC1155Upgradeable = await ethers.getContractFactory('MockERC1155Upgradeable')
     const mockERC1155Upgradeable = await MockERC1155Upgradeable.deploy()
 
     await mockERC1155Upgradeable.deployed()
@@ -14,7 +14,7 @@ async function main() {
         network.name,
         deployer.address
     )
-    await mockERC1155Upgradeable.initialize('MockERC1155', 'MOCK', 'https://google.com')
+    await mockERC1155Upgradeable.initialize('MockERC1155Upgradeable', 'MOCK', 'https://google.com')
 
     console.log('MockERC1155Upgradeable deployed to:', mockERC1155Upgradeable.address)
 }

src/mockContracts/testForge/MockERC1155.t.sol

@@ -39,7 +39,7 @@ contract MockERC1155Test is DSTest {
         uint256 tokenId_,
         uint256 amount_
     ) public {
-        vm.assume(to_ != address(0));
+        vm.assume(to_ != address(0) && to_.code.length == 0);
         vm.assume(tokenId_ > 0);
         vm.assume(amount_ > 0);
 
@@ -55,7 +55,7 @@ contract MockERC1155Test is DSTest {
         uint256 tokenId_,
         uint256 amount_
     ) public {
-        vm.assume(to_ != address(0));
+        vm.assume(to_ != address(0) && to_.code.length == 0);
         vm.assume(tokenId_ > 0);
         vm.assume(amount_ > 0);
 
@@ -77,7 +77,7 @@ contract MockERC1155Test is DSTest {
         uint256 tokenId_,
         uint256 amount_
     ) public {
-        vm.assume(to_ != address(0));
+        vm.assume(to_ != address(0) && to_.code.length == 0);
         vm.assume(tokenId_ > 0);
         vm.assume(amount_ > 0);
 

src/mockContracts/testForge/MockERC1155Upgradeable.t.sol

@@ -41,7 +41,7 @@ contract MockERC1155UpgradeableTest is DSTest {
         uint256 tokenId_,
         uint256 amount_
     ) public {
-        vm.assume(to_ != address(0));
+        vm.assume(to_ != address(0) && to_.code.length == 0);
         vm.assume(tokenId_ > 0);
         vm.assume(amount_ > 0);
 
@@ -57,7 +57,7 @@ contract MockERC1155UpgradeableTest is DSTest {
         uint256 tokenId_,
         uint256 amount_
     ) public {
-        vm.assume(to_ != address(0));
+        vm.assume(to_ != address(0) && to_.code.length == 0);
         vm.assume(tokenId_ > 0);
         vm.assume(amount_ > 0);
 
@@ -79,7 +79,7 @@ contract MockERC1155UpgradeableTest is DSTest {
         uint256 tokenId_,
         uint256 amount_
     ) public {
-        vm.assume(to_ != address(0));
+        vm.assume(to_ != address(0) && to_.code.length == 0);
         vm.assume(tokenId_ > 0);
         vm.assume(amount_ > 0);
 

src/mockContracts/testForge/MockERC721.t.sol

@@ -38,7 +38,7 @@ contract MockERC721Test is DSTest {
         address to_, 
         uint256 tokenId_
     ) public {
-        vm.assume(to_ != address(0));
+        vm.assume(to_ != address(0) && to_.code.length == 0);
         vm.assume(tokenId_ > 0);
 
         assertEq(mockERC721.balanceOf(to_), 0);
@@ -53,7 +53,7 @@ contract MockERC721Test is DSTest {
         address to_, 
         uint256 tokenId_
     ) public {
-        vm.assume(to_ != address(0));
+        vm.assume(to_ != address(0) && to_.code.length == 0);
         vm.assume(tokenId_ > 0);
 
         assertEq(mockERC721.balanceOf(to_), 0);

src/mockContracts/testForge/MockERC721Upgradeable.t.sol

@@ -39,7 +39,7 @@ contract MockERC721UpgradeableTest is DSTest {
         address to_, 
         uint256 tokenId_
     ) public {
-        vm.assume(to_ != address(0));
+        vm.assume(to_ != address(0) && to_.code.length == 0);
         vm.assume(tokenId_ > 0);
 
         assertEq(mockERC721Upgradeable.balanceOf(to_), 0);
@@ -54,7 +54,7 @@ contract MockERC721UpgradeableTest is DSTest {
         address to_, 
         uint256 tokenId_
     ) public {
-        vm.assume(to_ != address(0));
+        vm.assume(to_ != address(0) && to_.code.length == 0);
         vm.assume(tokenId_ > 0);
 
         assertEq(mockERC721Upgradeable.balanceOf(to_), 0);