From a9e5d05e702acbc351bea183ac7a077a4e2dec85 Mon Sep 17 00:00:00 2001 From: PhilWindle <60546371+PhilWindle@users.noreply.github.com> Date: Thu, 28 Sep 2023 15:30:15 +0100 Subject: [PATCH] fix(build): CI fixes from previous merges (#2579) This PR fixes some CI issues that crept in from previous merges. # Checklist: Remove the checklist to signal you've completed it. Enable auto-merge if the PR is ready to merge. - [ ] If the pull request requires a cryptography review (e.g. cryptographic algorithm implementations) I have added the 'crypto' tag. - [ ] I have reviewed my diff in github, line by line and removed unexpected formatting changes, testing logs, or commented-out code. - [ ] Every change is related to the PR description. - [ ] I have [linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) this pull request to relevant issues (if any exist). --- yarn-project/sequencer-client/src/sequencer/sequencer.test.ts | 1 + yarn-project/world-state/src/world-state-db/merkle_trees.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts index 1f1c76cc2ac..dc69b5f1b27 100644 --- a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts +++ b/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts @@ -70,6 +70,7 @@ describe('sequencer', () => { l1ToL2MessageSource = mock({ getPendingL1ToL2Messages: () => Promise.resolve(Array(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).fill(Fr.ZERO)), + getBlockNumber: () => Promise.resolve(lastBlockNumber), }); sequencer = new TestSubject( diff --git a/yarn-project/world-state/src/world-state-db/merkle_trees.ts b/yarn-project/world-state/src/world-state-db/merkle_trees.ts index b335a0eb947..1661b5a4ad7 100644 --- a/yarn-project/world-state/src/world-state-db/merkle_trees.ts +++ b/yarn-project/world-state/src/world-state-db/merkle_trees.ts @@ -28,7 +28,7 @@ import { loadTree, newTree, } from '@aztec/merkle-tree'; -import { L2Block, MerkleTreeId, SiblingPath, merkleTreeIds } from '@aztec/types'; +import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/types'; import { default as levelup } from 'levelup';