NostalgicFactory tests

Author: typicalHuman

foundry.toml

@@ -2,8 +2,8 @@
 src = "src"
 out = "out"
 libs = ["lib"]
-
+no_match_coverage = "test/"
 
 [lint]
 exclude_lints=["mixed-case-function", "asm-keccak256"]
-ignore = ["test/*"]
+ignore = ["test/*"]

src/NostalgicController.sol

@@ -185,4 +185,3 @@ contract NostalgicController is AccessControl, INostalgicController {
         );
     }
 }
-

src/NostalgicFactory.sol

@@ -70,13 +70,7 @@ contract NostalgicFactory is INostalgicFactory {
         uint256 _protocolFeesFactor
     ) external returns (address) {
         bytes32 salt = keccak256(
-            abi.encodePacked(
-                _underlyingAsset,
-                _name,
-                _symbol,
-                block.timestamp,
-                allPools.length
-            )
+            abi.encodePacked(_underlyingAsset, _name, _symbol, allPools.length)
         );
 
         address clone = POOL_IMPLEMENTATION.cloneDeterministic(salt);
@@ -92,6 +86,7 @@ contract NostalgicFactory is INostalgicFactory {
             pauser,
             _protocolFeesFactor
         );
+        poolsByCreator[msg.sender].push(clone);
 
         allPools.push(clone);
 
@@ -108,7 +103,10 @@ contract NostalgicFactory is INostalgicFactory {
             abi.encodePacked(_underlyingAsset, _name, _symbol, index)
         );
         return
-            POOL_IMPLEMENTATION.predictDeterministicAddress(salt, address(this));
+            POOL_IMPLEMENTATION.predictDeterministicAddress(
+                salt,
+                address(this)
+            );
     }
 
     function getPoolsByCreator(
@@ -120,13 +118,4 @@ contract NostalgicFactory is INostalgicFactory {
     function allPoolsCount() external view returns (uint256) {
         return allPools.length;
     }
-
-    function _isContract(address addr) internal view returns (bool) {
-        uint256 size;
-        // solhint-disable-next-line no-inline-assembly
-        assembly {
-            size := extcodesize(addr)
-        }
-        return size > 0;
-    }
 }

test/NostalgicFactory.t.sol

@@ -6,7 +6,7 @@ import {NostalgicFactory} from "../src/NostalgicFactory.sol";
 import {NostalgicPool} from "../src/NostalgicPool.sol";
 import {IAggregatorV3} from "../src/interfaces/IAggregatorV3.sol";
 import {INostalgicRateModel} from "../src/interfaces/INostalgicRateModel.sol";
-
+import {INostalgicFactoryErrors} from "../src/interfaces/INostalgicFactory.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {MockERC20} from "./mocks/MockERC20.t.sol";
 contract NostalgicFactoryTest is Test {
@@ -25,7 +25,17 @@ contract NostalgicFactoryTest is Test {
         );
     }
 
-    function testCreatePool() public {
+    function testRevertInit() public {
+        vm.expectRevert(INostalgicFactoryErrors.ZeroAddress.selector);
+        NostalgicFactory factory2 = new NostalgicFactory(
+            address(0),
+            address(0),
+            admin,
+            pauser
+        );
+    }
+
+    function testCreateBasicPool() public {
         address pool = factory.createPool(
             asset,
             "MOCK",
@@ -34,5 +44,8 @@ contract NostalgicFactoryTest is Test {
             INostalgicRateModel(address(3)),
             500
         );
+        assertEq(factory.allPoolsCount(), 1);
+        assertEq(factory.getPoolsByCreator(address(this))[0], pool);
+        assertEq(factory.predictPoolAddress(asset, "MOCK", "MOCK", 0), pool);
     }
 }