Skip to content

Minor sequencer cleanup #251

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
PhilWindle merged 1 commit into from
Apr 13, 2023
Merged

Minor sequencer cleanup #251

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions yarn-project/sequencer-client/src/block_builder/circuit_block_builder.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import { MockProxy, mock } from 'jest-mock-extended';
import { default as levelup } from 'levelup';
import flatMap from 'lodash.flatmap';
import { default as memdown } from 'memdown';
import { makeEmptyTx, makeEmptyUnverifiedData } from '../deps/tx.js';
import { VerificationKeys, getVerificationKeys } from '../deps/verification_keys.js';
import { makeEmptyTx, makeEmptyUnverifiedData } from '../mocks/tx.js';
import { VerificationKeys, getVerificationKeys } from '../mocks/verification_keys.js';
import { EmptyProver } from '../prover/empty.js';
import { Prover } from '../prover/index.js';
import { Simulator } from '../simulator/index.js';
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/sequencer-client/src/block_builder/circuit_block_builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { MerkleTreeId, MerkleTreeOperations } from '@aztec/world-state';
import chunk from 'lodash.chunk';
import flatMap from 'lodash.flatmap';
import times from 'lodash.times';
import { VerificationKeys } from '../deps/verification_keys.js';
import { VerificationKeys } from '../mocks/verification_keys.js';
import { Proof, Prover } from '../prover/index.js';
import { Simulator } from '../simulator/index.js';

Expand Down
53 changes: 0 additions & 53 deletions yarn-project/sequencer-client/src/deps/running_promise.ts
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions yarn-project/sequencer-client/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { PublisherConfig, TxSenderConfig } from './publisher/config.js';
export * from './sequencer/index.js';
export * from './publisher/index.js';
export * from './client/index.js';
export * from './deps/tx.js';
export * from './deps/verification_keys.js';
export * from './mocks/tx.js';
export * from './mocks/verification_keys.js';

export type SequencerClientConfig = PublisherConfig & TxSenderConfig & SequencerConfig;
0 yarn-project/sequencer-client/src/deps/tx.ts → ...-project/sequencer-client/src/mocks/tx.ts
View file
Open in desktop
File renamed without changes.
0 ...ncer-client/src/deps/verification_keys.ts → ...cer-client/src/mocks/verification_keys.ts
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions yarn-project/sequencer-client/src/sequencer/sequencer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { createDebugLogger } from '@aztec/foundation';
import { RunningPromise, createDebugLogger } from '@aztec/foundation';
import { P2P } from '@aztec/p2p';
import { Tx, UnverifiedData } from '@aztec/types';
import { MerkleTreeId, WorldStateStatus, WorldStateSynchroniser } from '@aztec/world-state';
import times from 'lodash.times';
import { BlockBuilder } from '../block_builder/index.js';
import { RunningPromise } from '../deps/running_promise.js';
import { makeEmptyTx } from '../index.js';
import { L1Publisher } from '../publisher/l1-publisher.js';
import { ceilPowerOfTwo } from '../utils.js';
Expand Down Expand Up @@ -40,7 +39,7 @@ export class Sequencer {
public async start() {
await this.initialSync();

this.runningPromise = new RunningPromise(this.work.bind(this), { pollingInterval: this.pollingIntervalMs });
this.runningPromise = new RunningPromise(this.work.bind(this), this.pollingIntervalMs);
this.runningPromise.start();
this.state = SequencerState.IDLE;
this.log('Sequencer started');
Expand Down