Merge branch 'main' into prover_cli_stuck_status

matter-labs · Aug 16, 2024 · 8e900fa · 8e900fa
2 parents db8aad5 + 6a2e3b0
commit 8e900fa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/core/lib/object_store/src/file.rs b/core/lib/object_store/src/file.rs
@@ -43,7 +43,6 @@ impl FileBackedObjectStore {
             Bucket::ProofsFri,
             Bucket::StorageSnapshot,
             Bucket::TeeVerifierInput,
-            Bucket::RamPermutationCircuitQueueWitness,
         ] {
             let bucket_path = format!("{base_dir}/{bucket}");
             fs::create_dir_all(&bucket_path).await?;

diff --git a/core/lib/object_store/src/raw.rs b/core/lib/object_store/src/raw.rs
@@ -20,7 +20,6 @@ pub enum Bucket {
     StorageSnapshot,
     DataAvailability,
     TeeVerifierInput,
-    RamPermutationCircuitQueueWitness,
 }
 
 impl Bucket {
@@ -40,7 +39,6 @@ impl Bucket {
             Self::StorageSnapshot => "storage_logs_snapshots",
             Self::DataAvailability => "data_availability",
             Self::TeeVerifierInput => "tee_verifier_inputs",
-            Self::RamPermutationCircuitQueueWitness => "ram_permutation_witnesses",
         }
     }
 }

diff --git a/prover/crates/bin/witness_generator/src/basic_circuits.rs b/prover/crates/bin/witness_generator/src/basic_circuits.rs
@@ -668,7 +668,11 @@ async fn generate_witness(
         .filter(|(circuit_id, _, _)| circuits_present.contains(circuit_id))
         .collect();
 
-    futures::future::join_all(save_ram_queue_witness_handles).await;
+    let _: Vec<_> = futures::future::join_all(save_ram_queue_witness_handles)
+        .await
+        .into_iter()
+        .map(|result| result.expect("failed to save ram permutation queue witness"))
+        .collect();
 
     scheduler_witness.previous_block_meta_hash = input.previous_batch_metadata.meta_hash.0;
     scheduler_witness.previous_block_aux_hash = input.previous_batch_metadata.aux_hash.0;

diff --git a/prover/crates/lib/prover_fri_types/src/lib.rs b/prover/crates/lib/prover_fri_types/src/lib.rs
@@ -229,7 +229,7 @@ pub struct RamPermutationQueueWitness {
 }
 
 impl StoredObject for RamPermutationQueueWitness {
-    const BUCKET: Bucket = Bucket::RamPermutationCircuitQueueWitness;
+    const BUCKET: Bucket = Bucket::ProverJobsFri;
     type Key<'a> = RamPermutationQueueWitnessKey;
 
     fn encode_key(key: Self::Key<'_>) -> String {