🌳 Move tests to a parallel tree

Author: KimlikDAO-bot

foundry.toml

@@ -3,7 +3,9 @@ sort_imports = true
 single_line_statement_blocks = "single"
 
 [profile.default]
-test = "./"
+test = "test"
+optimizer = true
+optimizer_runs = 20_000
 remappings = ['forge-std/=lib/forge-std/src/']
 
 [profile.ethereum]

avalanche/addresses.t.sol test/avalanche/addresses.t.sol

@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.0;
 
-import {TRYB, TRYB_DEPLOYER, USDC, USDC_DEPLOYER, USDT, USDT_DEPLOYER} from "./addresses.sol";
+import {TRYB, TRYB_DEPLOYER, USDC, USDC_DEPLOYER, USDT, USDT_DEPLOYER} from "avalanche/addresses.sol";
 import {Test} from "forge-std/Test.sol";
 
 contract addressesTest is Test {

test/kimlikdao/IProtocolFund.t.sol

@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import {RedeemInfo, RedeemInfoFrom} from "kimlikdao/IProtocolFund.sol";
+import {Test} from "forge-std/Test.sol";
+import {uint48x2From} from "types/uint48x2.sol";
+
+contract amountAddrTest is Test {
+    function testAccessors() public pure {
+        RedeemInfo info = RedeemInfoFrom(uint48x2From(2, 1), address(0x1337ACC));
+
+        (uint256 total, uint256 amount, address addr) = info.unpack();
+        assertEq(total, 2);
+        assertEq(amount, 1);
+        assertEq(addr, address(0x1337ACC));
+    }
+}

kimlikdao/addresses.t.sol test/kimlikdao/addresses.t.sol

@@ -2,6 +2,7 @@
 
 pragma solidity ^0.8.0;
 
+import {Test} from "forge-std/Test.sol";
 import {
     KDAOL,
     KDAOL_DEPLOYER,
@@ -18,8 +19,7 @@ import {
     PROTOCOL_FUND_DEPLOYER,
     PROTOCOL_FUND_ZKSYNC,
     PROTOCOL_FUND_ZKSYNC_DEPLOYER
-} from "./addresses.sol";
-import {Test} from "forge-std/Test.sol";
+} from "kimlikdao/addresses.sol";
 import {applyL1ToL2Alias, computeCreateAddress as computeZkSyncCreateAddress} from "zksync/IZkSync.sol";
 
 contract addressesTest is Test {

types/amountAddr.t.sol test/types/amountAddr.t.sol

@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.0;
 
-import {amountAddr, amountAddrFrom} from "./amountAddr.sol";
+import {amountAddr, amountAddrFrom} from "types/amountAddr.sol";
 import {Test} from "forge-std/Test.sol";
 
 contract amountAddrTest is Test {

types/uint128x2.t.sol test/types/uint128x2.t.sol

@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.0;
 
-import {uint128x2, uint128x2From} from "./uint128x2.sol";
+import {uint128x2, uint128x2From} from "types/uint128x2.sol";
 import {Test} from "forge-std/Test.sol";
 
 contract uint128x2Test is Test {

types/uint48x2.t.sol test/types/uint48x2.t.sol

@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.0;
 
-import {uint48x2, uint48x2From} from "./uint48x2.sol";
+import {uint48x2, uint48x2From} from "types/uint48x2.sol";
 import {Test} from "forge-std/Test.sol";
 
 contract uint48x2Test is Test {

zksync/L2Log.t.sol test/zksync/L2Log.t.sol

@@ -2,8 +2,8 @@
 
 pragma solidity ^0.8.20;
 
-import {L2LogLocator, L2LogLocatorFrom} from "./L2Log.sol";
 import {Test} from "forge-std/Test.sol";
+import {L2LogLocator, L2LogLocatorFrom} from "zksync/L2Log.sol";
 
 contract L2LogLocatorTest is Test {
     function testAccessors() public pure {

types/amountAddr.sol

@@ -20,6 +20,14 @@ function addr(amountAddr self) pure returns (address) {
     return address(uint160(amountAddr.unwrap(self)));
 }
 
+function setAddr(amountAddr self, address _addr) pure returns (amountAddr) {
+    return amountAddr.wrap(amountAddr.unwrap(self) & (type(uint256).max << 160) | uint256(uint160(_addr)));
+}
+
+function addAddr(amountAddr self, address _addr) pure returns (amountAddr) {
+    return amountAddr.wrap(amountAddr.unwrap(self) | uint160(_addr));
+}
+
 function notEqual(amountAddr self, amountAddr other) pure returns (bool) {
     return amountAddr.unwrap(self) != amountAddr.unwrap(other);
 }
@@ -28,4 +36,8 @@ function isZero(amountAddr self) pure returns (bool) {
     return amountAddr.unwrap(self) == 0;
 }
 
-using {unpack, amount, addr, isZero, notEqual as !=} for amountAddr global;
+function toBytes32(amountAddr self) pure returns (bytes32) {
+    return bytes32(amountAddr.unwrap(self));
+}
+
+using {unpack, amount, addr, addAddr, setAddr, isZero, toBytes32, notEqual as !=} for amountAddr global;

zksync/IL1Messenger.sol

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+interface IL1Messenger {
+    function sendToL1(bytes memory _message) external returns (bytes32);
+}
+
+address constant L1_MESSENGER = 0x0000000000000000000000000000000000008008;
+
+IL1Messenger constant L1Messenger = IL1Messenger(L1_MESSENGER);