Skip to content

fix: Syntax error when running tests via jest after tsc build #13051

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
spalladino merged 1 commit into from
Mar 26, 2025
Merged

fix: Syntax error when running tests via jest after tsc build #13051

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 16 additions & 16 deletions yarn-project/simulator/src/public/hinting_db_sources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export class HintingPublicTreesDB extends PublicTreesDB {
// Getters.
public override async getSiblingPath<N extends number>(treeId: MerkleTreeId, index: bigint): Promise<SiblingPath<N>> {
const path = await super.getSiblingPath<N>(treeId, index);
const key = await this.#getHintKey(treeId);
const key = await this.getHintKey(treeId);
this.hints.getSiblingPathHints.push(new AvmGetSiblingPathHint(key, treeId, index, path.toFields()));
return Promise.resolve(path);
}
Expand All @@ -120,7 +120,7 @@ export class HintingPublicTreesDB extends PublicTreesDB {
)}, ${value}}) returned undefined. Possible wrong tree setup or corrupted state.`,
);
}
const key = await this.#getHintKey(treeId);
const key = await this.getHintKey(treeId);
this.hints.getPreviousValueIndexHints.push(
new AvmGetPreviousValueIndexHint(key, treeId, new Fr(value), result.index, result.alreadyPresent),
);
Expand All @@ -133,7 +133,7 @@ export class HintingPublicTreesDB extends PublicTreesDB {
): Promise<IndexedTreeLeafPreimage | undefined> {
const preimage = await super.getLeafPreimage<ID>(treeId, index);
if (preimage) {
const key = await this.#getHintKey(treeId);
const key = await this.getHintKey(treeId);

switch (treeId) {
case MerkleTreeId.PUBLIC_DATA_TREE:
Expand Down Expand Up @@ -162,11 +162,11 @@ export class HintingPublicTreesDB extends PublicTreesDB {
leaves: Buffer[],
): Promise<SequentialInsertionResult<TreeHeight>> {
HintingPublicTreesDB.log.debug('sequentialInsert not hinted yet!');
const beforeState = await this.#getHintKey(treeId);
const beforeState = await this.getHintKey(treeId);

const result = await super.sequentialInsert<TreeHeight, ID>(treeId, leaves);

const afterState = await this.#getHintKey(treeId);
const afterState = await this.getHintKey(treeId);
HintingPublicTreesDB.log.debug(
`Evolved tree state (${getTreeName(treeId)}): ${beforeState.root}, ${beforeState.nextAvailableLeafIndex} -> ${
afterState.root
Expand All @@ -182,21 +182,21 @@ export class HintingPublicTreesDB extends PublicTreesDB {
// WARNING: is this enough? we might actually need the number of the checkpoint or similar...
// We will need to keep a stack of checkpoints on the C++ side.
const beforeState = {
[MerkleTreeId.PUBLIC_DATA_TREE]: await this.#getHintKey(MerkleTreeId.PUBLIC_DATA_TREE),
[MerkleTreeId.NULLIFIER_TREE]: await this.#getHintKey(MerkleTreeId.NULLIFIER_TREE),
[MerkleTreeId.NOTE_HASH_TREE]: await this.#getHintKey(MerkleTreeId.NOTE_HASH_TREE),
[MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: await this.#getHintKey(MerkleTreeId.L1_TO_L2_MESSAGE_TREE),
[MerkleTreeId.ARCHIVE]: await this.#getHintKey(MerkleTreeId.ARCHIVE),
[MerkleTreeId.PUBLIC_DATA_TREE]: await this.getHintKey(MerkleTreeId.PUBLIC_DATA_TREE),
[MerkleTreeId.NULLIFIER_TREE]: await this.getHintKey(MerkleTreeId.NULLIFIER_TREE),
[MerkleTreeId.NOTE_HASH_TREE]: await this.getHintKey(MerkleTreeId.NOTE_HASH_TREE),
[MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: await this.getHintKey(MerkleTreeId.L1_TO_L2_MESSAGE_TREE),
[MerkleTreeId.ARCHIVE]: await this.getHintKey(MerkleTreeId.ARCHIVE),
};

await super.revertCheckpoint();

const afterState = {
[MerkleTreeId.PUBLIC_DATA_TREE]: await this.#getHintKey(MerkleTreeId.PUBLIC_DATA_TREE),
[MerkleTreeId.NULLIFIER_TREE]: await this.#getHintKey(MerkleTreeId.NULLIFIER_TREE),
[MerkleTreeId.NOTE_HASH_TREE]: await this.#getHintKey(MerkleTreeId.NOTE_HASH_TREE),
[MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: await this.#getHintKey(MerkleTreeId.L1_TO_L2_MESSAGE_TREE),
[MerkleTreeId.ARCHIVE]: await this.#getHintKey(MerkleTreeId.ARCHIVE),
[MerkleTreeId.PUBLIC_DATA_TREE]: await this.getHintKey(MerkleTreeId.PUBLIC_DATA_TREE),
[MerkleTreeId.NULLIFIER_TREE]: await this.getHintKey(MerkleTreeId.NULLIFIER_TREE),
[MerkleTreeId.NOTE_HASH_TREE]: await this.getHintKey(MerkleTreeId.NOTE_HASH_TREE),
[MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: await this.getHintKey(MerkleTreeId.L1_TO_L2_MESSAGE_TREE),
[MerkleTreeId.ARCHIVE]: await this.getHintKey(MerkleTreeId.ARCHIVE),
};

HintingPublicTreesDB.log.debug('Evolved tree state:');
Expand All @@ -210,7 +210,7 @@ export class HintingPublicTreesDB extends PublicTreesDB {
}

// Private methods.
async #getHintKey(treeId: MerkleTreeId): Promise<AppendOnlyTreeSnapshot> {
private async getHintKey(treeId: MerkleTreeId): Promise<AppendOnlyTreeSnapshot> {
const treeInfo = await super.getTreeInfo(treeId);
return new AppendOnlyTreeSnapshot(Fr.fromBuffer(treeInfo.root), Number(treeInfo.size));
}
Expand Down