Move validation to MerkleTree constructor

OpenZeppelin · Mar 4, 2024 · a9ae830 · a9ae830
1 parent 6ff294d
commit a9ae830
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/src/merkletree.ts b/src/merkletree.ts
@@ -49,6 +49,7 @@ export abstract class MerkleTreeImpl<T> implements MerkleTree<T> {
       'Leaf values cannot be numbers',
     );
     this.hashLookup = Object.fromEntries(values.map(({ treeIndex }, valueIndex) => [tree[treeIndex], valueIndex]));
+    this.validate();
   }
 
   protected static prepare<T>(

diff --git a/src/simple.ts b/src/simple.ts
@@ -33,7 +33,6 @@ export class SimpleMerkleTree extends MerkleTreeImpl<BytesLike> {
     );
 
     const tree = new SimpleMerkleTree(data.tree, data.values, formatLeaf, nodeHash);
-    tree.validate();
     return tree;
   }
 

diff --git a/src/standard.ts b/src/standard.ts
@@ -34,7 +34,6 @@ export class StandardMerkleTree<T extends any[]> extends MerkleTreeImpl<T> {
     validateArgument(data.leafEncoding !== undefined, 'Expected leaf encoding');
 
     const tree = new StandardMerkleTree(data.tree, data.values, data.leafEncoding);
-    tree.validate();
     return tree;
   }
-Original file line number
+Diff line change
@@ Expand Up @@
         );
         const tree = new SimpleMerkleTree(data.tree, data.values, formatLeaf, nodeHash);
-        tree.validate();
         return tree;
       }
@@ Expand Down @@