refactor(test:zk): move Create2Test to file

matter-labs · Aug 27, 2024 · 388d81b · 388d81b
1 parent db13087
commit 388d81b
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 85 deletions.
diff --git a/crates/forge/tests/fixtures/zk/Create2.t.sol b/crates/forge/tests/fixtures/zk/Create2.t.sol
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.18;
+
+import "forge-std/Test.sol";
+import {L2ContractHelper} from "era-contracts/l2-contracts/contracts/L2ContractHelper.sol"; // =0.8.20
+
+import {Greeter} from "../src/Greeter.sol";
+import {CustomNumber} from "../src/CustomNumber.sol";
+
+import {Create2Utils} from "../src/Create2Utils.sol";
+
+contract Create2Test is Test {
+    function getBytecodeHash(string memory path) internal returns (bytes32 bytecodeHash) {
+        string memory artifact = vm.readFile(path);
+        bytecodeHash = vm.parseJsonBytes32(artifact, ".hash");
+    }
+
+    function testCanDeployViaCreate2() public {
+        bytes32 bytecodeHash = getBytecodeHash("zkout/Greeter.sol/Greeter.json");
+        address sender = address(0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496);
+        bytes32 salt = "12345";
+        bytes32 constructorInputHash = keccak256(abi.encode());
+
+        address expectedAddress =
+            Create2Utils.computeCreate2Address(sender, salt, bytes32(bytecodeHash), constructorInputHash);
+
+        // deploy via create2
+        address actualAddress = address(new ConstantNumber{salt: salt}());
+
+        assertEq(actualAddress, expectedAddress);
+    }
+
+    function testComputeCreate2WithNoArgs() external {
+        bytes32 salt = bytes32(0x0);
+
+        bytes32 bytecodeHash = getBytecodeHash("zkout/Greeter.sol/Greeter.json");
+
+        address computedAddress =
+            Create2Utils.computeCreate2Address(address(this), salt, bytes32(bytecodeHash), keccak256(abi.encode()));
+        address expectedAddress =
+            L2ContractHelper.computeCreate2Address(address(this), salt, bytes32(bytecodeHash), keccak256(abi.encode()));
+
+        address actualAddress = address(new Greeter{salt: salt}());
+        assertEq(actualAddress, expectedAddress);
+        assertEq(computedAddress, expectedAddress);
+    }
+
+    function testComputeCreate2WithArgs() external {
+        bytes32 salt = bytes32(0x0);
+        uint8 value = 42;
+
+        bytes32 bytecodeHash = getBytecodeHash("zkout/CustomNumber.sol/CustomNumber.json");
+
+        address computedAddress =
+            Create2Utils.computeCreate2Address(address(this), salt, bytecodeHash, keccak256(abi.encode(value)));
+        address expectedAddress =
+            L2ContractHelper.computeCreate2Address(address(this), salt, bytecodeHash, keccak256(abi.encode(value)));
+
+        CustomNumber num = new CustomNumber{salt: salt}(value);
+        assertEq(address(num), expectedAddress);
+        assertEq(computedAddress, expectedAddress);
+        assertEq(num.number(), value);
+    }
+}
diff --git a/crates/forge/tests/it/zk/contracts.rs b/crates/forge/tests/it/zk/contracts.rs
@@ -68,91 +68,7 @@ async fn test_zk_contract_create2() {
 
     prj.add_source("Create2Utils.sol", include_str!("../../../../../testdata/zk/Create2Utils.sol")).unwrap();
 
-    prj.add_test("Create2.t.sol",
-    r#"
-pragma solidity ^0.8.18;
-import "forge-std/Test.sol";
-import {L2ContractHelper} from "era-contracts/l2-contracts/contracts/L2ContractHelper.sol"; // =0.8.20
-
-import {Greeter} from "../src/Greeter.sol";
-import {CustomNumber} from "../src/CustomNumber.sol";
-
-import {Create2Utils} from "../src/Create2Utils.sol";
-
-contract Create2Test is Test {
-    function getBytecodeHash(string memory path) internal returns (bytes32 bytecodeHash) {
-        string memory artifact = vm.readFile(path);
-        bytecodeHash = vm.parseJsonBytes32(
-            artifact,
-            '.hash'
-        );
-    }
-
-    function testCanDeployViaCreate2() public {
-        bytes32 bytecodeHash = getBytecodeHash("zkout/Greeter.sol/Greeter.json");
-        address sender = address(0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496);
-        bytes32 salt = "12345";
-        bytes32 constructorInputHash = keccak256(abi.encode());
-
-        address expectedAddress =
-            Create2Utils.computeCreate2Address(sender, salt, bytes32(bytecodeHash), constructorInputHash);
-
-        // deploy via create2
-        address actualAddress = address(new ConstantNumber{salt: salt}());
-
-        assertEq(actualAddress, expectedAddress);
-    }
-
-
-    function testComputeCreate2WithNoArgs() external {
-        bytes32 salt = bytes32(0x0);
-
-        bytes32 bytecodeHash = getBytecodeHash("zkout/Greeter.sol/Greeter.json");
-
-        address computedAddress = Create2Utils.computeCreate2Address(
-            address(this),
-            salt,
-            bytes32(bytecodeHash),
-            keccak256(abi.encode())
-        );
-        address expectedAddress = L2ContractHelper.computeCreate2Address(
-            address(this),
-            salt,
-            bytes32(bytecodeHash),
-            keccak256(abi.encode())
-        );
-
-        address actualAddress = address(new Greeter{salt: salt}());
-        assertEq(actualAddress, expectedAddress);
-        assertEq(computedAddress, expectedAddress);
-    }
-
-    function testComputeCreate2WithArgs() external {
-        bytes32 salt = bytes32(0x0);
-        uint8 value = 42;
-
-        bytes32 bytecodeHash = getBytecodeHash("zkout/CustomNumber.sol/CustomNumber.json");
-
-        address computedAddress = Create2Utils.computeCreate2Address(
-            address(this),
-            salt,
-            bytecodeHash,
-            keccak256(abi.encode(value))
-        );
-        address expectedAddress = L2ContractHelper.computeCreate2Address(
-            address(this),
-            salt,
-            bytecodeHash,
-            keccak256(abi.encode(value))
-        );
-
-        CustomNumber num = new CustomNumber{salt: salt}(value);
-        assertEq(address(num), expectedAddress);
-        assertEq(computedAddress, expectedAddress);
-        assertEq(num.number(), value);
-    }
-}
-"#).unwrap();
+    prj.add_test("Create2.t.sol", include_str!("../../fixtures/zk/Create2.t.sol")).unwrap();
 
     cmd.args(["test", "--zk-startup", "--mc", "Create2Test"]);
     assert!(cmd.stdout_lossy().contains("Suite result: ok"));