refactor(contracts): adapt and improve immutable args on voting test use case

Author: 0xjei

packages/contracts/contracts/src/core/factories/FactoryChecker.sol

@@ -10,9 +10,24 @@ abstract contract FactoryChecker is Factory {
     /// @param _implementation Address of checker implementation.
     constructor(address _implementation) Factory(_implementation) {}
 
-    /// @notice Deploys new checker clone with specific verifiers.
-    /// @param verifiers Array of verifier addresses for this instance.
-    function deploy(address[] calldata verifiers) internal virtual returns (address) {
-        return _deployClone(abi.encode(verifiers));
+    /// @notice Packs verifier addresses with additional arguments
+    /// @param verifiers Array of verifier addresses
+    /// @param extraArgs Additional configuration arguments
+    /// @return bytes Packed arguments for clone deployment
+    function _packArgs(address[] calldata verifiers, bytes memory extraArgs) internal pure returns (bytes memory) {
+        return bytes.concat(abi.encode(verifiers), extraArgs);
+    }
+
+    /// @notice Extended deploy with extra arguments
+    /// @param verifiers Array of verifier addresses
+    /// @param extraArgs Additional configuration arguments
+    function _deploy(address[] calldata verifiers, bytes memory extraArgs) internal returns (address) {
+        return _deployClone(_packArgs(verifiers, extraArgs));
+    }
+
+    /// @notice Basic deploy with only verifiers
+    /// @param verifiers Array of verifier addresses
+    function _deploy(address[] calldata verifiers) internal returns (address) {
+        return _deployClone(_packArgs(verifiers, "")); // Empty bytes for no extra args
     }
 }

packages/contracts/contracts/src/test/advanced/AdvancedERC721PolicyFactory.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {AdvancedPolicy} from "../../core/policy/AdvancedPolicy.sol";
-import {Check} from "../../core/interfaces/IAdvancedPolicy.sol";
+import {AdvancedPolicy} from "../../../core/policy/AdvancedPolicy.sol";
+import {Check} from "../../../core/policy/interfaces/IAdvancedPolicy.sol";
 
 /// @title AdvancedVoting.
 /// @notice Advanced voting system with NFT-based phases and eligibility verification.

packages/contracts/contracts/src/test/base/BaseERC721PolicyFactory.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {AdvancedChecker} from "../../core/checker/AdvancedChecker.sol";
-import {BaseERC721Checker} from "../base/BaseERC721Checker.sol";
+import {AdvancedChecker} from "../../../../core/checker/AdvancedChecker.sol";
+import {BaseERC721Checker} from "../../base/checker/BaseERC721Checker.sol";
 import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {LibClone} from "solady/src/utils/LibClone.sol";
 

packages/contracts/contracts/src/test/advanced/AdvancedVoting.sol packages/contracts/contracts/src/test/voting/advanced/AdvancedVoting.sol

@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {CheckerFactory} from "../../core/checker/CheckerFactory.sol";
+import {FactoryChecker} from "../../../../core/factories/FactoryChecker.sol";
 import {AdvancedERC721Checker} from "./AdvancedERC721Checker.sol";
 
-/// @title AdvancedERC721CheckerFactory
+/// @title AdvancedERC721FactoryChecker
 /// @notice Factory for deploying AdvancedERC721Checker clones
 /// @dev Handles deployment with verifiers and validation parameters
-contract AdvancedERC721CheckerFactory is CheckerFactory {
-    constructor() CheckerFactory(address(new AdvancedERC721Checker())) {}
+contract AdvancedERC721FactoryChecker is FactoryChecker {
+    constructor() FactoryChecker(address(new AdvancedERC721Checker())) {}
 
     /// @notice Deploys new checker clone with specific configuration
     /// @param verifiers Array of verifier addresses [signupNFT, rewardNFT, baseChecker]
@@ -22,12 +22,7 @@ contract AdvancedERC721CheckerFactory is CheckerFactory {
         uint256 minTokenId,
         uint256 maxTokenId
     ) public returns (address clone) {
-        bytes memory args = bytes.concat(
-            abi.encode(verifiers), // Array of verifiers
-            abi.encode(minBalance), // Balance threshold
-            abi.encode(minTokenId), // Token ID range
-            abi.encode(maxTokenId)
-        );
-        clone = _deployClone(args);
+        bytes memory extraArgs = abi.encode(minBalance, minTokenId, maxTokenId);
+        return _deploy(verifiers, extraArgs);
     }
 }

packages/contracts/contracts/src/test/advanced/AdvancedERC721Checker.sol packages/contracts/contracts/src/test/voting/advanced/checker/AdvancedERC721Checker.sol

@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+import {AdvancedERC721Policy} from "./AdvancedERC721Policy.sol";
+import {AdvancedERC721Checker} from "../checker/AdvancedERC721Checker.sol";
+import {FactoryAdvancedPolicy} from "../../../../core/factories/FactoryAdvancedPolicy.sol";
+
+// @todo
+contract AdvancedERC721FactoryPolicy is FactoryAdvancedPolicy {
+    constructor() FactoryAdvancedPolicy(address(new AdvancedERC721Policy())) {}
+
+    function deploy(
+        AdvancedERC721Checker checker,
+        bool skipPre,
+        bool skipPost,
+        bool allowMultipleMain
+    ) public returns (address clone) {
+        bytes memory args = bytes.concat(
+            abi.encode(checker),
+            abi.encode(skipPre),
+            abi.encode(skipPost),
+            abi.encode(allowMultipleMain)
+        );
+        clone = _deployClone(args);
+    }
+}

packages/contracts/contracts/src/test/advanced/AdvancedERC721CheckerFactory.sol packages/contracts/contracts/src/test/voting/advanced/checker/AdvancedERC721FactoryChecker.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {AdvancedPolicy} from "../../core/policy/AdvancedPolicy.sol";
-import {AdvancedERC721Checker} from "./AdvancedERC721Checker.sol";
+import {AdvancedPolicy} from "../../../../core/policy/AdvancedPolicy.sol";
 
 /// @title AdvancedERC721Policy.
 /// @notice Three-phase ERC721 validation policy.

packages/contracts/contracts/src/test/voting/advanced/policy/AdvancedERC721FactoryPolicy.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {AdvancedERC721Checker} from "../advanced/AdvancedERC721Checker.sol";
-import {Check} from "../../core/interfaces/IAdvancedChecker.sol";
+import {AdvancedERC721Checker} from "../../checker/AdvancedERC721Checker.sol";
+import {Check} from "../../../../../core/checker/interfaces/IAdvancedChecker.sol";
 
 /// @title AdvancedERC721CheckerHarness.
 /// @notice Test harness exposing internal methods of AdvancedERC721Checker.

packages/contracts/contracts/src/test/advanced/AdvancedERC721Policy.sol packages/contracts/contracts/src/test/voting/advanced/policy/AdvancedERC721Policy.sol

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+import {AdvancedERC721FactoryChecker} from "../../checker/AdvancedERC721FactoryChecker.sol";
+
+/// @title AdvancedERC721FactoryCheckerHarness
+/// @notice Test harness exposing internal methods of AdvancedERC721CheckerFactory.
+contract AdvancedERC721FactoryCheckerHarness is AdvancedERC721FactoryChecker {
+    constructor() AdvancedERC721FactoryChecker() {}
+
+    function exposed__packArgs(
+        address[] calldata verifiers,
+        bytes memory extraArgs
+    ) public pure returns (bytes memory) {
+        return _packArgs(verifiers, extraArgs);
+    }
+
+    function exposed__deploy(address[] calldata verifiers) public returns (address clone) {
+        return _deploy(verifiers);
+    }
+
+    function exposed__deploy(address[] calldata verifiers, bytes calldata extraArgs) public returns (address clone) {
+        return _deploy(verifiers, extraArgs);
+    }
+}

packages/contracts/contracts/src/test/Advanced.t.sol packages/contracts/contracts/src/test/voting/advanced/test/Advanced.t.sol

@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+import {AdvancedERC721FactoryPolicy} from "../../policy/AdvancedERC721FactoryPolicy.sol";
+import {AdvancedERC721Checker} from "../../checker/AdvancedERC721Checker.sol";
+
+// @todo
+contract AdvancedERC721FactoryPolicyHarness is AdvancedERC721FactoryPolicy {
+    constructor() AdvancedERC721FactoryPolicy() {}
+
+    //@todo
+    function exposed__deploy(
+        AdvancedERC721Checker checker,
+        bool skipPre,
+        bool skipPost,
+        bool allowMultipleMain
+    ) internal returns (address) {
+        return _deploy(checker, skipPre, skipPost, allowMultipleMain);
+    }
+}

packages/contracts/contracts/src/test/wrappers/AdvancedERC721CheckerHarness.sol packages/contracts/contracts/src/test/voting/advanced/test/wrappers/AdvancedERC721CheckerHarness.sol

@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {AdvancedERC721Policy} from "../advanced/AdvancedERC721Policy.sol";
-import {AdvancedERC721Checker} from "../advanced/AdvancedERC721Checker.sol";
-import {Check} from "../../core/interfaces/IAdvancedChecker.sol";
+import {AdvancedERC721Policy} from "../../policy/AdvancedERC721Policy.sol";
+import {Check} from "../../../../../core/checker/interfaces/IAdvancedChecker.sol";
 
 /// @title AdvancedERC721PolicyHarness.
 /// @notice Test harness for AdvancedERC721Policy internal methods.

packages/contracts/contracts/src/test/voting/advanced/test/wrappers/AdvancedERC721FactoryCheckerHarness.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {BaseERC721Policy} from "./BaseERC721Policy.sol";
+import {BaseERC721Policy} from "./policy/BaseERC721Policy.sol";
 
 /// @title BaseVoting.
 /// @notice Simple voting system with NFT-based access control.

packages/contracts/contracts/src/test/voting/advanced/test/wrappers/AdvancedERC721FactoryPolicyHarness.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {BaseChecker} from "../../core/checker/BaseChecker.sol";
+import {BaseChecker} from "../../../../core/checker/BaseChecker.sol";
 import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {LibClone} from "solady/src/utils/LibClone.sol";
 
@@ -10,7 +10,7 @@ import {LibClone} from "solady/src/utils/LibClone.sol";
 /// @dev Extends BaseChecker for NFT ownership verification.
 contract BaseERC721Checker is BaseChecker {
     /// @notice NFT contract reference.
-    IERC721 public immutable NFT;
+    IERC721 public NFT;
 
     /// @notice Initializes checker with immutable args.
     constructor() BaseChecker() {

packages/contracts/contracts/src/test/wrappers/AdvancedERC721PolicyHarness.sol packages/contracts/contracts/src/test/voting/advanced/test/wrappers/AdvancedERC721PolicyHarness.sol

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {CheckerFactory} from "../../core/checker/CheckerFactory.sol";
+import {FactoryChecker} from "../../../../core/factories/FactoryChecker.sol";
 import {BaseERC721Checker} from "./BaseERC721Checker.sol";
 
-/// @title BaseERC721CheckerFactory
+/// @title BaseERC721FactoryChecker
 /// @notice Factory for deploying BaseERC721Checker clones
 /// @dev Handles deployment with verifiers and validation parameters
 /// note that I reuse the same deploy from CheckerFactory contract.
-contract BaseERC721CheckerFactory is CheckerFactory {
-    constructor() CheckerFactory(address(new BaseERC721Checker())) {}
+contract BaseERC721FactoryChecker is FactoryChecker {
+    constructor() FactoryChecker(address(new BaseERC721Checker())) {}
 }

packages/contracts/contracts/src/test/base/BaseVoting.sol packages/contracts/contracts/src/test/voting/base/BaseVoting.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+import {FactoryBasePolicy} from "../../../../core/factories/FactoryBasePolicy.sol";
+import {BaseERC721Policy} from "./BaseERC721Policy.sol";
+
+//@todo
+contract BaseERC721FactoryPolicy is FactoryBasePolicy {
+    constructor() FactoryBasePolicy(address(new BaseERC721Policy())) {}
+}

packages/contracts/contracts/src/test/base/BaseERC721Checker.sol packages/contracts/contracts/src/test/voting/base/checker/BaseERC721Checker.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {BasePolicy} from "../../core/policy/BasePolicy.sol";
-import {BaseERC721Checker} from "./BaseERC721Checker.sol";
+import {BasePolicy} from "../../../../core/policy/BasePolicy.sol";
 
 /// @title BaseERC721Policy.
 /// @notice Policy enforcer for ERC721 token validation.

packages/contracts/contracts/src/test/base/BaseERC721CheckerFactory.sol packages/contracts/contracts/src/test/voting/base/checker/BaseERC721FactoryChecker.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {BaseERC721Checker} from "../base/BaseERC721Checker.sol";
+import {BaseERC721Checker} from "../../checker/BaseERC721Checker.sol";
 
 /// @title BaseERC721CheckerHarness.
 /// @notice Test harness for BaseERC721Checker internal methods.

packages/contracts/contracts/src/test/voting/base/policy/BaseERC721FactoryPolicy.sol

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+import {BaseERC721FactoryChecker} from "../../checker/BaseERC721FactoryChecker.sol";
+
+/// @title BaseERC721FactoryCheckerHarness
+/// @notice Test harness exposing internal methods of BaseERC721FactoryChecker.
+contract BaseERC721FactoryCheckerHarness is BaseERC721FactoryChecker {
+    constructor() BaseERC721FactoryChecker() {}
+
+    function exposed__packArgs(
+        address[] calldata verifiers,
+        bytes memory extraArgs
+    ) public pure returns (bytes memory) {
+        return _packArgs(verifiers, extraArgs);
+    }
+
+    function exposed__deploy(address[] calldata verifiers) public returns (address clone) {
+        return _deploy(verifiers);
+    }
+
+    function exposed__deploy(address[] calldata verifiers, bytes calldata extraArgs) public returns (address clone) {
+        return _deploy(verifiers, extraArgs);
+    }
+}

packages/contracts/contracts/src/test/base/BaseERC721Policy.sol packages/contracts/contracts/src/test/voting/base/policy/BaseERC721Policy.sol

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+import {BaseERC721FactoryPolicy} from "../../policy/BaseERC721FactoryPolicy.sol";
+import {BaseERC721Checker} from "../../checker/BaseERC721Checker.sol";
+
+/// @title BaseERC721FactoryPolicyHarness
+/// @notice Test harness exposing internal methods of BaseERC721FactoryPolicy.
+contract BaseERC721FactoryPolicyHarness is BaseERC721FactoryPolicy {
+    constructor() BaseERC721FactoryPolicy() {}
+
+    //@todo
+    function exposed__deploy(BaseERC721Checker checker) internal virtual returns (address) {
+        return _deploy(checker);
+    }
+}

packages/contracts/contracts/src/test/Base.t.sol packages/contracts/contracts/src/test/voting/base/test/Base.t.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {BaseERC721Policy} from "../base/BaseERC721Policy.sol";
-import {BaseERC721Checker} from "../base/BaseERC721Checker.sol";
+import {BaseERC721Policy} from "../../policy/BaseERC721Policy.sol";
 
 /// @title BaseERC721PolicyHarness.
 /// @notice Test harness for BaseERC721Policy internal methods.