fix: same to te/gc_investigate_4 but do not add misc change

ChainSafe · Jun 28, 2024 · 7372a7b · 7372a7b
1 parent ab76885
commit 7372a7b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 31 deletions.
diff --git a/packages/ssz/src/viewDU/arrayComposite.ts b/packages/ssz/src/viewDU/arrayComposite.ts
@@ -1,9 +1,4 @@
-import {
-  getNodeAtDepth,
-  getNodesAtDepth,
-  Node,
-  setNodesAtDepth,
-} from "@chainsafe/persistent-merkle-tree";
+import {getNodeAtDepth, getNodesAtDepth, Node, setNodesAtDepth} from "@chainsafe/persistent-merkle-tree";
 import {ValueOf} from "../type/abstract";
 import {CompositeType, CompositeView, CompositeViewDU} from "../type/composite";
 import {ArrayCompositeType} from "../view/arrayComposite";

diff --git a/packages/ssz/src/viewDU/container.ts b/packages/ssz/src/viewDU/container.ts
@@ -127,10 +127,7 @@ class ContainerTreeViewDU<Fields extends Record<string, Type<unknown>>> extends
    * Same method to `type/container.ts` that call ViewDU.serializeToBytes() of internal fields.
    */
   serializeToBytes(output: ByteViews, offset: number): number {
-    // it's the responsibility of consumer to call commit() before calling this method
-    if (this.nodesChanged.size !== 0 || this.viewsChanged.size !== 0) {
-      throw Error(`Must commit changes before serializeToBytes(Uint8Array(${output.uint8Array.length}, ${offset})`);
-    }
+    this.commit();
 
     let fixedIndex = offset;
     let variableIndex = offset + this.type.fixedEnd;

diff --git a/packages/ssz/src/viewDU/containerNodeStruct.ts b/packages/ssz/src/viewDU/containerNodeStruct.ts
@@ -29,17 +29,13 @@ class ContainerTreeViewDU<Fields extends Record<string, Type<unknown>>> extends
 
   commit(): void {
     if (this.valueChanged === null) {
-      // this does not suppor batch hash
-      // this._rootNode.root;
       return;
     }
 
     const value = this.valueChanged;
     this.valueChanged = null;
 
     this._rootNode = this.type.value_toTree(value) as BranchNodeStruct<ValueOfFields<Fields>>;
-    // this does not suppor batch hash
-    // this._rootNode.root;
   }
 
   protected clearCache(): void {

diff --git a/packages/ssz/src/viewDU/listBasic.ts b/packages/ssz/src/viewDU/listBasic.ts
@@ -46,13 +46,11 @@ export class ListBasicTreeViewDU<ElementType extends BasicType<unknown>> extends
    */
   sliceTo(index: number): this {
     if (index < 0) {
-      throw Error(`Does not support sliceTo() with negative index ${index}`);
+      throw new Error(`Does not support sliceTo() with negative index ${index}`);
     }
 
-    // it's the responsibility of consumer to call commit() before calling this method
-    if (this.nodesChanged.size > 0) {
-      throw Error(`Must commit changes before sliceTo(${index})`);
-    }
+    // Commit before getting rootNode to ensure all pending data is in the rootNode
+    this.commit();
 
     // All nodes beyond length are already zero
     if (index >= this._length - 1) {
@@ -86,10 +84,7 @@ export class ListBasicTreeViewDU<ElementType extends BasicType<unknown>> extends
    * Same method to `type/listBasic.ts` leveraging cached nodes.
    */
   serializeToBytes(output: ByteViews, offset: number): number {
-    // it's the responsibility of consumer to call commit() before calling this method
-    if (this.nodesChanged.size > 0) {
-      throw Error(`Must commit changes before serializeToBytes(Uint8Array(${output.uint8Array.length}), ${offset})`);
-    }
+    this.commit();
     const {nodes, nodesPopulated} = this.cache;
     const chunksNode = this.type.tree_getChunksNode(this._rootNode);
     return tree_serializeToBytesArrayBasic(

diff --git a/packages/ssz/src/viewDU/listComposite.ts b/packages/ssz/src/viewDU/listComposite.ts
@@ -44,10 +44,8 @@ export class ListCompositeTreeViewDU<
    * Note: Using index = -1, returns an empty list of length 0.
    */
   sliceTo(index: number): this {
-    // it's the responsibility of consumer to call commit() before calling this method
-    if (this.viewsChanged.size > 0) {
-      throw Error(`Must commit changes before sliceTo(${index})`);
-    }
+    // Commit before getting rootNode to ensure all pending data is in the rootNode
+    this.commit();
     const rootNode = this._rootNode;
     const length = this._length;
 
@@ -113,10 +111,7 @@ export class ListCompositeTreeViewDU<
    * Same method to `type/listComposite.ts` leveraging cached nodes.
    */
   serializeToBytes(output: ByteViews, offset: number): number {
-    // it's the responsibility of consumer to call commit() before calling this method
-    if (this.viewsChanged.size > 0) {
-      throw Error(`Must commit changes before serializeToBytes(Uint8Array(${output.uint8Array.length}, ${offset})`);
-    }
+    this.commit();
     this.populateAllNodes();
     const chunksNode = this.type.tree_getChunksNode(this._rootNode);
     return tree_serializeToBytesArrayComposite(