merged main

celestiaorg · Jul 31, 2024 · 630af96 · 630af96
2 parents b083ebb + 57c8c01
commit 630af96
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/lib/tree/Utils.sol b/src/lib/tree/Utils.sol
@@ -81,8 +81,8 @@ function _getSplitPoint(uint256 x) pure returns (uint256) {
 /// not overlap `end`.
 /// @param begin Begin index, inclusive.
 /// @param end End index, exclusive.
-function nextSubtreeSize(uint256 begin, uint256 end) pure returns (uint256) {
-    uint256 ideal = bitsTrailingZeroes(begin);
+function _nextSubtreeSize(uint256 begin, uint256 end) pure returns (uint256) {
+    uint256 ideal = _bitsTrailingZeroes(begin);
     uint256 max = _bitsLen(end - begin) - 1;
     if (ideal > max) {
         return 1 << max;
@@ -93,7 +93,7 @@ function nextSubtreeSize(uint256 begin, uint256 end) pure returns (uint256) {
 /// @notice Returns the number of trailing zero bits in `x`; the result is
 /// 256 for `x` == 0.
 /// @param x Number.
-function bitsTrailingZeroes(uint256 x) pure returns (uint256) {
+function _bitsTrailingZeroes(uint256 x) pure returns (uint256) {
     uint256 mask = 1;
     uint256 count = 0;
 

diff --git a/src/lib/tree/binary/BinaryMerkleTree.sol b/src/lib/tree/binary/BinaryMerkleTree.sol
@@ -119,7 +119,7 @@ library BinaryMerkleTree {
         bytes32[] memory leftSubtrees = new bytes32[](proof.sideNodes.length);
 
         for (uint256 i = 0; leafIndex != proof.beginKey && i < proof.sideNodes.length; ++i) {
-            uint256 subtreeSize = nextSubtreeSize(leafIndex, proof.beginKey);
+            uint256 subtreeSize = _nextSubtreeSize(leafIndex, proof.beginKey);
             leftSubtrees[i] = proof.sideNodes[i];
             leafIndex += subtreeSize;
         }