🐞 Fix clearHi() and clearLo() bugs; add tests

Author: KimlikDAO-bot

test/avalanche/addresses.t.sol

@@ -6,7 +6,7 @@ import {TRYB, TRYB_DEPLOYER, USDC, USDC_DEPLOYER, USDT, USDT_DEPLOYER} from "ava
 import {Test} from "forge-std/Test.sol";
 
 contract addressesTest is Test {
-    function testDeployerConsistency() public pure {
+    function testDeployerConsistency() external pure {
         assertEq(vm.computeCreateAddress(TRYB_DEPLOYER, 2), address(TRYB));
         assertEq(vm.computeCreateAddress(USDC_DEPLOYER, 4), address(USDC));
         assertEq(vm.computeCreateAddress(USDT_DEPLOYER, 2), address(USDT));

test/kimlikdao/IProtocolFund.t.sol

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

test/types/amountAddr.t.sol

@@ -2,11 +2,11 @@
 
 pragma solidity ^0.8.0;
 
-import {amountAddr, amountAddrFrom} from "types/amountAddr.sol";
 import {Test} from "forge-std/Test.sol";
+import {amountAddr, amountAddrFrom} from "types/amountAddr.sol";
 
 contract amountAddrTest is Test {
-    function testAccessors() public pure {
+    function testAccessors() external pure {
         amountAddr aaddr = amountAddrFrom(1, address(0x1337ACC));
 
         assertEq(aaddr.addr(), address(0x1337ACC));

test/types/uint128x2.t.sol

@@ -2,18 +2,18 @@
 
 pragma solidity ^0.8.0;
 
-import {uint128x2, uint128x2From} from "types/uint128x2.sol";
 import {Test} from "forge-std/Test.sol";
+import {uint128x2, uint128x2From} from "types/uint128x2.sol";
 
 contract uint128x2Test is Test {
-    function testAccessors() public pure {
+    function testAccessors() external pure {
         uint128x2 pair = uint128x2From(1, 2);
 
         assertEq(pair.lo(), 2);
         assertEq(pair.hi(), 1);
     }
 
-    function testIncDec() public pure {
+    function testIncDec() external pure {
         uint128x2 pair = uint128x2From(300, 500);
         pair = pair.inc(200);
 
@@ -32,7 +32,7 @@ contract uint128x2Test is Test {
         assert(pair2 == pair3);
     }
 
-    function tesetClear() public pure {
+    function tesetClear() external pure {
         uint128x2 i = uint128x2From(2, 1);
 
         i = i.clearHi();
@@ -47,12 +47,28 @@ contract uint128x2Test is Test {
         assertEq(j.lo(), 0);
     }
 
-    function testSum() public pure {
+    function testSum() external pure {
         uint128x2 i = uint128x2From(type(uint128).max - 1, 1);
 
         assertEq(i.sum(), type(uint128).max);
         assertEq(uint128x2From(1, 2).sum(), 3);
         assertEq(uint128x2From(2, 3).sum(), 5);
         assertEq(uint128x2From(1337, 1338).sum(), 2 * 1337 + 1);
     }
+
+    function testClearLo() external pure {
+        uint128x2 n = uint128x2From(2, 1);
+        n = n.clearLo();
+
+        assertEq(n.hi(), 2);
+        assertEq(n.lo(), 0);
+    }
+
+    function testClearHi() external pure {
+        uint128x2 n = uint128x2From(100, 50);
+        n = n.clearHi();
+
+        assertEq(n.hi(), 0);
+        assertEq(n.lo(), 50);
+    }
 }

test/types/uint48x2.t.sol

@@ -2,18 +2,18 @@
 
 pragma solidity ^0.8.0;
 
-import {uint48x2, uint48x2From} from "types/uint48x2.sol";
 import {Test} from "forge-std/Test.sol";
+import {uint48x2, uint48x2From} from "types/uint48x2.sol";
 
 contract uint48x2Test is Test {
-    function testAccessors() public pure {
+    function testAccessors() external pure {
         uint48x2 pair = uint48x2From(1, 2);
 
         assertEq(pair.lo(), 2);
         assertEq(pair.hi(), 1);
     }
 
-    function testIncDec() public pure {
+    function testIncDec() external pure {
         uint48x2 pair = uint48x2From(300, 500);
         pair = pair.inc(200);
 
@@ -32,7 +32,7 @@ contract uint48x2Test is Test {
         assert(pair2 == pair3);
     }
 
-    function tesetClear() public pure {
+    function tesetClear() external pure {
         uint48x2 i = uint48x2From(2, 1);
 
         i = i.clearHi();
@@ -47,7 +47,7 @@ contract uint48x2Test is Test {
         assertEq(j.lo(), 0);
     }
 
-    function testSum() public pure {
+    function testSum() external pure {
         uint48x2 i = uint48x2From(type(uint48).max - 1, 1);
 
         assertEq(i.sum(), type(uint48).max);
@@ -56,10 +56,24 @@ contract uint48x2Test is Test {
         assertEq(uint48x2From(1337, 1338).sum(), 2 * 1337 + 1);
     }
 
-    function testSetLo() public pure {
+    function testSetLo() external pure {
         uint48x2 i = uint48x2From(2, 3);
 
         assertEq(i.setLo(4).hi(), 2);
         assertEq(i.setLo(4).lo(), 4);
     }
+
+    function testClearLo() external pure {
+        uint48x2 n = uint48x2From(3, 2).clearLo();
+
+        assertEq(n.hi(), 3);
+        assertEq(n.lo(), 0);
+    }
+
+    function testClearHi() external pure {
+        uint48x2 n = uint48x2From(3, 2).clearHi();
+
+        assertEq(n.hi(), 0);
+        assertEq(n.lo(), 2);
+    }
 }

test/zksync/L2Log.t.sol

@@ -6,7 +6,7 @@ import {Test} from "forge-std/Test.sol";
 import {L2LogLocator, L2LogLocatorFrom} from "zksync/L2Log.sol";
 
 contract L2LogLocatorTest is Test {
-    function testAccessors() public pure {
+    function testAccessors() external pure {
         L2LogLocator l = L2LogLocatorFrom(1, 2, 3);
         assertEq(l.batchNumber(), 1);
         assertEq(l.messageIndex(), 2);

types/uint128x2.sol

@@ -63,11 +63,11 @@ function sum(uint128x2 self) pure returns (uint256) {
 }
 
 function clearLo(uint128x2 self) pure returns (uint128x2) {
-    return uint128x2.wrap(uint128x2.unwrap(self) & ~type(uint128).max);
+    return uint128x2.wrap(uint128x2.unwrap(self) & (~uint256(0) << 128));
 }
 
 function clearHi(uint128x2 self) pure returns (uint128x2) {
-    return uint128x2.wrap(uint128x2.unwrap(self) & type(uint128).max);
+    return uint128x2.wrap(uint128x2.unwrap(self) & (~uint256(0) >> 128));
 }
 
 function equal(uint128x2 self, uint128x2 other) pure returns (bool) {

types/uint48x2.sol

@@ -65,11 +65,11 @@ function sum(uint48x2 self) pure returns (uint256) {
 }
 
 function clearLo(uint48x2 self) pure returns (uint48x2) {
-    return uint48x2.wrap(uint48x2.unwrap(self) & ~type(uint48).max);
+    return uint48x2.wrap(uint48x2.unwrap(self) & (~uint256(0) << 48));
 }
 
 function clearHi(uint48x2 self) pure returns (uint48x2) {
-    return uint48x2.wrap(uint48x2.unwrap(self) & type(uint48).max);
+    return uint48x2.wrap(uint48x2.unwrap(self) & (~uint256(0) >> 208));
 }
 
 function equal(uint48x2 self, uint48x2 other) pure returns (bool) {