Fix bad rebase

AztecProtocol · Feb 19, 2025 · 1ea405c · 1ea405c
1 parent 88b0d0d
commit 1ea405c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/yarn-project/end-to-end/src/e2e_epochs/epochs_test.ts b/yarn-project/end-to-end/src/e2e_epochs/epochs_test.ts
@@ -1,7 +1,8 @@
 import { Fr, type Logger, getTimestampRangeForEpoch, retryUntil, sleep } from '@aztec/aztec.js';
 import { ChainMonitor } from '@aztec/aztec.js/ethereum';
 // eslint-disable-next-line no-restricted-imports
-import { type L1RollupConstants, type L2BlockNumber, MerkleTreeId } from '@aztec/circuit-types';
+import { type L1RollupConstants, MerkleTreeId } from '@aztec/circuit-types';
+import { type L2BlockNumber } from '@aztec/circuit-types/interfaces/client';
 import { RollupContract } from '@aztec/ethereum/contracts';
 import { DelayedTxUtils, type Delayer, waitUntilL1Timestamp } from '@aztec/ethereum/test';
 import { randomBytes } from '@aztec/foundation/crypto';

diff --git a/yarn-project/txe/src/node/txe_node.ts b/yarn-project/txe/src/node/txe_node.ts
@@ -17,7 +17,6 @@ import {
   TxReceipt,
   TxScopedL2Log,
   type TxValidationResult,
-  type WorldStateSyncStatus,
 } from '@aztec/circuit-types';
 import { type AztecNode, type L2BlockNumber } from '@aztec/circuit-types/interfaces/client';
 import {
@@ -26,6 +25,7 @@ import {
   type NullifierMembershipWitness,
   type ProverConfig,
   type SequencerConfig,
+  type WorldStateSyncStatus,
 } from '@aztec/circuit-types/interfaces/server';
 import {
   type AztecAddress,