test(fast-inbox): follow the InboxParity request type through the broker and restart tests (A-1427)

The base parity and root parity request types collapsed into a single INBOX_PARITY,
so the broker abort/revive tests and the prover-restart parity predicate reference it.

Author: spalladino

yarn-project/end-to-end/src/single-node/proving/prover_restart.parallel.test.ts

@@ -33,8 +33,7 @@ const ALL_PROVING_TYPES = Object.values(ProvingRequestType).filter(
   (t): t is ProvingRequestType => typeof t === 'number',
 );
 
-const isParity = (type: ProvingRequestType) =>
-  type === ProvingRequestType.PARITY_BASE || type === ProvingRequestType.PARITY_ROOT;
+const isParity = (type: ProvingRequestType) => type === ProvingRequestType.INBOX_PARITY;
 
 const isTxBaseRollup = (type: ProvingRequestType) =>
   type === ProvingRequestType.PRIVATE_TX_BASE_ROLLUP || type === ProvingRequestType.PUBLIC_TX_BASE_ROLLUP;

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

@@ -222,7 +222,7 @@ describe.each([
     it('revives an aborted job when its producer re-requests it', async () => {
       const provingJob: ProvingJob = {
         id: makeRandomProvingJobId(),
-        type: ProvingRequestType.PARITY_BASE,
+        type: ProvingRequestType.INBOX_PARITY,
         epochNumber: EpochNumber(1),
         inputsUri: makeInputsUri(),
       };
@@ -239,7 +239,7 @@ describe.each([
       // 'in-queue', and it can then be completed.
       await expect(broker.enqueueProvingJob(provingJob)).resolves.toEqual({ status: 'in-queue' });
       await assertJobStatus(provingJob.id, 'in-queue');
-      const returnedJob = await broker.getProvingJob({ allowList: [ProvingRequestType.PARITY_BASE] });
+      const returnedJob = await broker.getProvingJob({ allowList: [ProvingRequestType.INBOX_PARITY] });
       expect(returnedJob?.job).toEqual(provingJob);
 
       const retryValue = makeOutputsUri();
@@ -250,7 +250,7 @@ describe.each([
     it('persists the aborted state across a restart and revives on re-request', async () => {
       const provingJob: ProvingJob = {
         id: makeRandomProvingJobId(),
-        type: ProvingRequestType.PARITY_BASE,
+        type: ProvingRequestType.INBOX_PARITY,
         epochNumber: EpochNumber(1),
         inputsUri: makeInputsUri(),
       };
@@ -276,7 +276,7 @@ describe.each([
       // 'in-queue' status), and it can be completed.
       await expect(broker.enqueueProvingJob(provingJob)).resolves.toEqual({ status: 'in-queue' });
       await assertJobStatus(provingJob.id, 'in-queue');
-      const returnedJob = await broker.getProvingJob({ allowList: [ProvingRequestType.PARITY_BASE] });
+      const returnedJob = await broker.getProvingJob({ allowList: [ProvingRequestType.INBOX_PARITY] });
       expect(returnedJob?.job).toEqual(provingJob);
 
       const value = makeOutputsUri();
@@ -287,7 +287,7 @@ describe.each([
     it('persists the revived (non-aborted) state, so a restart mid-revival stays revived', async () => {
       const provingJob: ProvingJob = {
         id: makeRandomProvingJobId(),
-        type: ProvingRequestType.PARITY_BASE,
+        type: ProvingRequestType.INBOX_PARITY,
         epochNumber: EpochNumber(1),
         inputsUri: makeInputsUri(),
       };
@@ -318,7 +318,7 @@ describe.each([
     it('revives once when the producer re-requests an aborted job concurrently', async () => {
       const provingJob: ProvingJob = {
         id: makeRandomProvingJobId(),
-        type: ProvingRequestType.PARITY_BASE,
+        type: ProvingRequestType.INBOX_PARITY,
         epochNumber: EpochNumber(1),
         inputsUri: makeInputsUri(),
       };
@@ -338,10 +338,10 @@ describe.each([
       expect(second).toEqual({ status: 'in-queue' });
       await assertJobStatus(provingJob.id, 'in-queue');
 
-      const returnedJob = await broker.getProvingJob({ allowList: [ProvingRequestType.PARITY_BASE] });
+      const returnedJob = await broker.getProvingJob({ allowList: [ProvingRequestType.INBOX_PARITY] });
       expect(returnedJob?.job).toEqual(provingJob);
       await assertJobStatus(provingJob.id, 'in-progress');
-      await expect(broker.getProvingJob({ allowList: [ProvingRequestType.PARITY_BASE] })).resolves.toBeUndefined();
+      await expect(broker.getProvingJob({ allowList: [ProvingRequestType.INBOX_PARITY] })).resolves.toBeUndefined();
 
       await broker.reportProvingJobSuccess(provingJob.id, makeOutputsUri());
       await assertJobStatus(provingJob.id, 'fulfilled');

yarn-project/prover-client/src/proving_broker/proving_broker_database/broker_persisted_database.test.ts

@@ -137,7 +137,7 @@ describe('ProvingBrokerPersistedDatabase', () => {
     const job: ProvingJob = {
       id,
       epochNumber: EpochNumber(42),
-      type: ProvingRequestType.PARITY_BASE,
+      type: ProvingRequestType.INBOX_PARITY,
       inputsUri: makeInputsUri(),
     };
     await db.addProvingJob(job);