relocate TreeNode tests

Author: turbocrime

src/TreeNodeCbor.sol

@@ -96,6 +96,7 @@ library TreeNodeCbor {
                 TreeNodeE[] memory e;
                 (e, byteIdx) = readNodeE(cborData, byteIdx);
                 node.entries = buildEntryKeys(e);
+                //node.entries = dummyEntryKeys(e); // skipping rebuild saves approx 300k gas
             }
         }
         return (node, byteIdx);

test/TreeCbor.t.sol

@@ -23,8 +23,6 @@ contract TreeTest is Test {
     bytes[] private nodeCbors;
     TreeCbor.Tree private tree;
 
-    TreeNodeCbor.TreeNodeE[] private e;
-
     function setUp() public {
         nodeCbors = new bytes[](4);
         nodeCbors[0] =
@@ -41,7 +39,6 @@ contract TreeTest is Test {
         require(byteIdx == rootCborWithoutSig.length, "expected to read all root commit bytes");
         rootCid = CidCbor.readCidBytes32(TreeTest.rootCborWithoutSig, rootCommit.data);
         tree = TreeCbor.readTree(nodeCbors);
-        (e,) = TreeNodeCbor.readNodeE(nodeCbors[0], 3);
     }
 
     function test_readTree_only() public view {
@@ -60,12 +57,4 @@ contract TreeTest is Test {
         console.log("node.left index", CidCbor.CidIndex.unwrap(rootNode.left));
         console.log("node.entries length", rootNode.entries.length);
     }
-
-    function test_readNodeE_only() public view {
-        TreeNodeCbor.readNodeE(nodeCbors[0], 3);
-    }
-
-    function test_buildEntryKeys_only() public view {
-        TreeNodeCbor.buildEntryKeys(e);
-    }
 }

test/TreeNodeCbor.t.sol

@@ -6,22 +6,28 @@ import "../src/CborDecode.sol";
 import "../src/TreeNodeCbor.sol";
 import "../src/CidCbor.sol";
 
-contract TreeNodeCborTest {
-    bytes private constant treeNode =
+contract TreeNodeCborTest is Test {
+    bytes private constant treeNodeBytes =
         hex"a2616585a4616b58236170702e62736b792e67726170682e666f6c6c6f772f336b77767534737665647332346170006174d82a58250001711220b000383f1466f65b0a02da763f46cf0e4510d832f6c609a9df56db73b81259376176d82a582500017112205cd7382608fb47afda979840cf0024b3d2d2e9e43448713909e998b6a1849490a4616b486679656a776332346170181b6174d82a58250001711220b295211bc0bfc8a6c8404f4877e96c37b25272c85e4942a29b178d26803f13996176d82a5825000171122017428f68c9c19f59b08b4b2d71ce96e04cdaf6139b94baf0a2c5ee51aa74493fa4616b486d77686f6e3232346170181b6174d82a58250001711220752be9d63155323fc5ce8753bdb5832fc7f5ad762c4e37944a6de84bbb9516876176d82a582500017112200fe8a27c597fcc6059888660b321e473bdaa94b45d0a702f3bd05e013ff17564a4616b486e337667376332346170181b6174d82a58250001711220ff7f6bd81b38a383101aec250c290ec6cd33555baf1e644f4b6d9b60a2e1fb856176d82a58250001711220a9f192fea504ecf8ae900d2a4f9f37551865132ae50bf680ac1687636afee7e1a4616b486f797875373232346170181b6174d82a582500017112204afcab072750efa8755714ca8477b35e871b71856a329c9973c4b94b7a4c98986176d82a58250001711220c46c805c774dcd3eaf4f90cef5e63f1f2a53f9c6bdb14b7397e736678b54dc97616cd82a582500017112206e7335ed248edae3ed49d47b88a5fcad2985e15f416f8ae23a49dfc1231aeb91";
 
+    TreeNodeCbor.TreeNodeE[] private e;
+
+    function setUp() public {
+        (e,) = TreeNodeCbor.readNodeE(treeNodeBytes, 3);
+    }
+
     function test_readTreeNode_only() public pure {
-        TreeNodeCbor.readTreeNode(treeNode, 0);
+        TreeNodeCbor.readTreeNode(treeNodeBytes, 0);
     }
 
     function test_readTreeNode_valid() public pure {
-        (TreeNodeCbor.TreeNode memory node, uint byteIdx) = TreeNodeCbor.readTreeNode(treeNode, 0);
+        (TreeNodeCbor.TreeNode memory node, uint byteIdx) = TreeNodeCbor.readTreeNode(treeNodeBytes, 0);
 
-        require(byteIdx == treeNode.length, "expected to read all bytes");
+        require(byteIdx == treeNodeBytes.length, "expected to read all bytes");
         require(node.entries.length == 5, "expected 5 entries");
         require(CidCbor.CidIndex.unwrap(node.left) != 0, "expected left cid to be non-null");
 
-        CidCbor.CidBytes32 leftCid = CidCbor.readCidBytes32(treeNode, node.left);
+        CidCbor.CidBytes32 leftCid = CidCbor.readCidBytes32(treeNodeBytes, node.left);
 
         require(
             CidCbor.CidBytes32.unwrap(leftCid) == hex"6e7335ed248edae3ed49d47b88a5fcad2985e15f416f8ae23a49dfc1231aeb91",
@@ -34,4 +40,29 @@ contract TreeNodeCborTest {
             console.log("tree", CidCbor.CidIndex.unwrap(node.entries[i].tree));
         }
     }
+
+    function test_readNodeE_only() public pure {
+        TreeNodeCbor.readNodeE(treeNodeBytes, 3);
+    }
+
+    function test_buildEntryKeys_only() public view {
+        TreeNodeCbor.buildEntryKeys(e);
+    }
+
+    function test_dummyEntryKeys() public view {
+        dummyEntryKeys(e);
+    }
+
+    // like buildEntryKeys but without the actual key rebuild
+    function dummyEntryKeys(TreeNodeCbor.TreeNodeE[] memory de)
+        internal
+        pure
+        returns (TreeNodeCbor.TreeNodeEntry[] memory)
+    {
+        TreeNodeCbor.TreeNodeEntry[] memory entries = new TreeNodeCbor.TreeNodeEntry[](de.length);
+        for (uint i = 0; i < de.length; i++) {
+            entries[i] = TreeNodeCbor.TreeNodeEntry(string(de[i].k), de[i].v, de[i].t);
+        }
+        return entries;
+    }
 }