Skip to content

fix: sliceFrom api #394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wemeetagain merged 3 commits into from
Aug 19, 2024
Merged

fix: sliceFrom api #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aab9347
chore: reproduce the bug in sliceFrom()
twoeths Aug 19, 2024
bb4e2d1
fix: sliceFrom()
twoeths Aug 19, 2024
8eeb3cc
chore: more comments
twoeths Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/ssz/src/viewDU/listComposite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ export class ListCompositeTreeViewDU<
sliceFrom(index: number): this {
// Commit before getting rootNode to ensure all pending data is in the rootNode
this.commit();
// populate to `this.nodes` to ensure all nodes are loaded
this.populateAllNodes();

// If negative index, try to make it positive long as |index| < length
if (index < 0) {
Expand Down
20 changes: 12 additions & 8 deletions packages/ssz/test/unit/byType/listComposite/tree.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {CompositeView, ContainerType, ListCompositeType, toHexString, UintNumber
import {ArrayCompositeTreeViewDU} from "../../../../src/viewDU/arrayComposite";
import {ssz} from "../../../lodestarTypes/primitive";
import {runViewTestMutation} from "../runViewTestMutation";
import {ListCompositeTreeViewDU} from "../../../../src/viewDU/listComposite";

const uint64NumInfType = new UintNumberType(8, {clipInfinity: true});
const containerUintsType = new ContainerType(
Expand Down Expand Up @@ -196,20 +197,23 @@ describe("ListCompositeType.sliceTo", () => {
});

describe("ListCompositeType.sliceFrom", () => {
it("Slice List from multiple length", () => {
const listType = new ListCompositeType(ssz.Root, 1024);
const listLength = 16;
const list = Array.from({length: listLength}, (_, i) => Buffer.alloc(32, i));
const listView = listType.toViewDU(list);
const listType = new ListCompositeType(ssz.Root, 1024);
const listLength = 16;
const list = Array.from({length: listLength}, (_, i) => Buffer.alloc(32, i));
let listView: ListCompositeTreeViewDU<typeof ssz.Root>;
beforeEach(() => {
listView = listType.toViewDU(list);
});

for (let i = -(listLength + 1); i < listLength + 1; i++) {
for (let i = -(listLength + 1); i < listLength + 1; i++) {
it(`Slice List from list length ${listLength}`, () => {
// compare list.slice(i) to listView.sliceFrom(i), they should be equivalent
const slicedList = list.slice(i);
const slicedListView = listView.sliceFrom(i);

expect(slicedListView.length).to.equal(slicedList.length);
expect(toHexString(slicedListView.serialize())).to.equal(toHexString(listType.serialize(slicedList)));
expect(toHexString(slicedListView.hashTreeRoot())).to.equal(toHexString(listType.hashTreeRoot(slicedList)));
}
});
});
}
});