Cleanup

yarn-project/prover-client/src/prover/bb_prover.test.ts

@@ -49,7 +49,6 @@ describe('prover/bb_prover', () => {
 
   afterAll(async () => {
     if (directoryToCleanup) {
-      logger.info(`Cleaning up ${directoryToCleanup}`);
       await fs.rm(directoryToCleanup, { recursive: true, force: true });
     }
   }, 5000);
@@ -63,7 +62,11 @@ describe('prover/bb_prover', () => {
       baseRollupInputs.push(await buildBaseRollupInput(tx, globalVariables, builderDb));
     }
     logger.verbose('Proving base rollups');
-    await Promise.all(baseRollupInputs.map(inputs => prover.getBaseRollupProof(inputs)));
+    const proofOutputs = await Promise.all(baseRollupInputs.map(inputs => prover.getBaseRollupProof(inputs)));
+    logger.verbose('Verifying base rollups');
+    await expect(
+      Promise.all(proofOutputs.map(output => prover.verifyProof('BaseRollupArtifact', output[1]))),
+    ).resolves.not.toThrow();
   }, 600_000);
 
   it('proves all circuits', async () => {

yarn-project/prover-client/src/prover/bb_prover.ts

@@ -175,7 +175,6 @@ export class BBNativeRollupProver implements CircuitProver {
   public async createProof(witnessMap: WitnessMap, circuitType: ServerProtocolArtifact): Promise<[WitnessMap, Proof]> {
     // Create random directory to be used for temp files
     const bbWorkingDirectory = `${this.config.bbWorkingDirectory}/${randomBytes(8).toString('hex')}`;
-    logger.info(`Creating directory ${bbWorkingDirectory}`);
     await fs.mkdir(bbWorkingDirectory, { recursive: true });
 
     await fs.access(bbWorkingDirectory);

yarn-project/simulator/src/simulator/acvm_native.ts

@@ -121,35 +121,9 @@ export async function executeNativeCircuit(
 
     const duration = new Timer();
     const output = await processPromise;
-
-    const lsPromise = new Promise<void>(resolve => {
-      let outputWitness = Buffer.alloc(0);
-      let errorBuffer = Buffer.alloc(0);
-      const acvm = proc.spawn('ls', ['-lh', `${workingDirectory}`]);
-      acvm.stdout.on('data', data => {
-        outputWitness = Buffer.concat([outputWitness, data]);
-        logger.info(`From LS at ${workingDirectory}: ${outputWitness.toString('utf-8')}`);
-      });
-      acvm.stderr.on('data', data => {
-        errorBuffer = Buffer.concat([errorBuffer, data]);
-        logger.info(`Error LS at ${workingDirectory}: ${errorBuffer.toString('utf-8')}`);
-      });
-      acvm.on('close', _ => {
-        resolve();
-      });
-    });
-
-    await lsPromise;
-
     if (outputFilename) {
       const outputWitnessFileName = `${workingDirectory}/output-witness.gz`;
-      try {
-        await fs.access(outputWitnessFileName);
-      } catch (error) {
-        logger.error(`Output witness not present at ${outputWitnessFileName}`);
-        return { status: ACVM_RESULT.FAILURE, reason: `Output witness not present at ${outputWitnessFileName}` };
-      }
-      await fs.copyFile(`${workingDirectory}/output-witness.gz`, outputFilename);
+      await fs.copyFile(outputWitnessFileName, outputFilename);
     }
     const witness = parseIntoWitnessMap(output);
     return { status: ACVM_RESULT.SUCCESS, witness, duration: duration.ms() };
@@ -169,13 +143,11 @@ export class NativeACVMSimulator implements SimulationProvider {
     // Provide a unique working directory so we don't get clashes with parallel executions
     const directory = `${this.workingDirectory}/${randomBytes(8).toString('hex')}`;
 
-    logger.error(`Creating directory ${directory}`);
     await fs.mkdir(directory, { recursive: true });
 
     // Execute the circuit
     const result = await executeNativeCircuit(input, decodedBytecode, directory, this.pathToAcvm, this.witnessFilename);
 
-    logger.error(`Removing directory ${directory}`);
     await fs.rm(directory, { force: true, recursive: true });
 
     if (result.status == ACVM_RESULT.FAILURE) {