Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion yarn-project/prover-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
".": "./dest/index.js",
"./block-builder": "./dest/block_builder/index.js",
"./broker": "./dest/proving_broker/index.js",
"./prover-agent": "./dest/prover-agent/index.js",
"./orchestrator": "./dest/orchestrator/index.js",
"./helpers": "./dest/orchestrator/block-building-helpers.js",
"./config": "./dest/config.js"
Expand Down
18 changes: 7 additions & 11 deletions yarn-project/prover-client/src/mocks/test_context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import {
WASMSimulatorWithBlobs,
type WorldStateDB,
} from '@aztec/simulator/server';
import { getTelemetryClient } from '@aztec/telemetry-client';
import { type MerkleTreeAdminDatabase } from '@aztec/world-state';
import { NativeWorldStateService } from '@aztec/world-state/native';

Expand All @@ -40,8 +39,7 @@ import { AvmFinalizedCallResult } from '../../../simulator/src/avm/avm_contract_
import { type AvmPersistableStateManager } from '../../../simulator/src/avm/journal/journal.js';
import { buildBlock } from '../block_builder/light.js';
import { ProvingOrchestrator } from '../orchestrator/index.js';
import { MemoryProvingQueue } from '../prover-agent/memory-proving-queue.js';
import { ProverAgent } from '../prover-agent/prover-agent.js';
import { TestBroker } from '../test/mock_prover.js';
import { getEnvironmentConfig, getSimulationProvider, makeGlobals, updateExpectedTreesFromTxs } from './fixtures.js';

export class TestContext {
Expand All @@ -54,7 +52,7 @@ export class TestContext {
public simulationProvider: SimulationProvider,
public globalVariables: GlobalVariables,
public prover: ServerCircuitProver,
public proverAgent: ProverAgent,
public broker: TestBroker,
public orchestrator: TestProvingOrchestrator,
public blockNumber: number,
public directoriesToCleanup: string[],
Expand Down Expand Up @@ -115,12 +113,10 @@ export class TestContext {
directoriesToCleanup.push(config.directoryToCleanup);
}

const queue = new MemoryProvingQueue(getTelemetryClient());
const orchestrator = new TestProvingOrchestrator(ws, queue, Fr.ZERO);
const agent = new ProverAgent(localProver, proverCount, undefined);
const broker = new TestBroker(proverCount, localProver);
const orchestrator = new TestProvingOrchestrator(ws, broker.facade, Fr.ZERO);

queue.start();
agent.start(queue);
await broker.start();

return new this(
publicTxSimulator,
Expand All @@ -129,7 +125,7 @@ export class TestContext {
simulationProvider,
globalVariables,
localProver,
agent,
broker,
orchestrator,
blockNumber,
directoriesToCleanup,
Expand All @@ -152,7 +148,7 @@ export class TestContext {
}

async cleanup() {
await this.proverAgent.stop();
await this.broker.stop();
for (const dir of this.directoriesToCleanup.filter(x => x !== '')) {
await fs.rm(dir, { recursive: true, force: true });
}
Expand Down

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions yarn-project/prover-client/src/prover-agent/index.ts

This file was deleted.

Loading