From 221bb9d8fcd77ce48eeafe2447aa8452865508c6 Mon Sep 17 00:00:00 2001
From: QiaoPengjun5162 <qiaopengjun0@gmail.com>
Date: Mon, 29 Jul 2024 11:01:12 +0800
Subject: [PATCH] fix test

---
 src/ERC20Token.sol          |  2 +-
 src/TokenFactoryV1.sol      | 24 ++++++++++++-----------
 test/TokenFactoryV1Test.sol |  2 ++
 test/TokenFactoryV2Test.sol | 38 +++++++++----------------------------
 4 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/src/ERC20Token.sol b/src/ERC20Token.sol
index 2a9c349..bbb7af7 100644
--- a/src/ERC20Token.sol
+++ b/src/ERC20Token.sol
@@ -26,7 +26,7 @@ contract ERC20Token is
 
     /// @custom:oz-upgrades-unsafe-allow constructor
     constructor() {
-        _disableInitializers();
+        // _disableInitializers();
     }
 
     /**
diff --git a/src/TokenFactoryV1.sol b/src/TokenFactoryV1.sol
index c718632..f4f4bfd 100644
--- a/src/TokenFactoryV1.sol
+++ b/src/TokenFactoryV1.sol
@@ -44,17 +44,19 @@ contract TokenFactoryV1 is Initializable, OwnableUpgradeable, UUPSUpgradeable {
         uint perMint
     ) public {
         // 部署实现
-        ERC20Token implementation = new ERC20Token();
-        // Deploy the proxy and initialize the contract through the proxy
-        proxy = new ERC1967Proxy(
-            address(implementation),
-            abi.encodeCall(
-                implementation.initialize,
-                (msg.sender, symbol, totalSupply, perMint)
-            )
-        );
-        // 用代理关联 MyToken 接口
-        myToken = ERC20Token(address(proxy));
+        // ERC20Token implementation = new ERC20Token();
+        // // Deploy the proxy and initialize the contract through the proxy
+        // proxy = new ERC1967Proxy(
+        //     address(implementation),
+        //     abi.encodeCall(
+        //         implementation.initialize,
+        //         (msg.sender, symbol, totalSupply, perMint)
+        //     )
+        // );
+        // // 用代理关联 MyToken 接口
+        // myToken = ERC20Token(address(proxy));
+        myToken = new ERC20Token();
+        myToken.initialize(msg.sender, symbol, totalSupply, perMint);
         console.log("deployInscription newToken: ", address(myToken));
 
         deployedTokens.push(address(myToken));
diff --git a/test/TokenFactoryV1Test.sol b/test/TokenFactoryV1Test.sol
index 780e65e..d6060fb 100644
--- a/test/TokenFactoryV1Test.sol
+++ b/test/TokenFactoryV1Test.sol
@@ -129,4 +129,6 @@ contract TokenFactoryV1Test is Test {
             owner.addr
         );
     }
+
+    function testV1Upgradeability() public {}
 }
diff --git a/test/TokenFactoryV2Test.sol b/test/TokenFactoryV2Test.sol
index 60e75e5..4b87004 100644
--- a/test/TokenFactoryV2Test.sol
+++ b/test/TokenFactoryV2Test.sol
@@ -11,19 +11,9 @@ import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
 import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";
 
-contract MyToken is ERC20, Ownable, ERC20Permit {
-    constructor(
-        address initialOwner
-    ) ERC20("MyToken", "MTK") Ownable(initialOwner) ERC20Permit("MyToken") {}
-
-    function mint(address to, uint256 amount) public onlyOwner {
-        _mint(to, amount);
-    }
-}
-
 contract CounterTest is Test {
     TokenFactoryV2 public factoryv2;
-    MyToken public erc20Token;
+
     ERC20Token public myToken;
     ERC1967Proxy proxy;
     ERC1967Proxy proxy2;
@@ -37,18 +27,8 @@ contract CounterTest is Test {
     address public tokenAddr;
 
     function setUp() public {
-        erc20Token = new MyToken(owner.addr);
-        // myToken.initialize(owner.addr, symbol, totalSupply, perMint);
-        // Deploy the proxy and initialize the contract through the proxy
-        // proxy = new ERC1967Proxy(
-        //     address(implementation),
-        //     abi.encodeCall(
-        //         implementation.initialize,
-        //         (owner.addr, symbol, totalSupply, perMint)
-        //     )
-        // );
-        // 用代理关联 MyToken 接口
-        // myToken = ERC20Token(address(proxy));
+        myToken = new ERC20Token();
+        myToken.initialize(msg.sender, symbol, totalSupply, perMint);
 
         TokenFactoryV2 implementationV2 = new TokenFactoryV2();
         vm.prank(owner.addr);
@@ -58,18 +38,18 @@ contract CounterTest is Test {
         );
 
         // 用代理关联 TokenFactoryV2 接口
-        // factoryv2 = TokenFactoryV2(address(proxy));
+        factoryv2 = TokenFactoryV2(address(proxy));
 
         vm.prank(owner.addr);
-        (bool _success, bytes memory returnData) = address(proxy).call(
+        (bool success, ) = address(proxy).call(
             abi.encodeWithSelector(
                 factoryv2.setLibraryAddress.selector,
-                address(erc20Token)
+                address(myToken)
             )
         );
-        console.log(_success, "Success");
-        require(_success);
-        // tokenAddr = abi.decode(returnData, (address));
+
+        require(success);
+
         // Emit the owner address for debugging purposes
         emit log_address(owner.addr);
     }