use setup_data_path for snark setup data

matter-labs · Jan 23, 2025 · 079ada1 · 079ada1
1 parent add00a2
commit 079ada1
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/prover/crates/lib/keystore/src/keystore.rs b/prover/crates/lib/keystore/src/keystore.rs
@@ -133,10 +133,10 @@ impl Keystore {
                 .basedir
                 .join(format!("finalization_hints_{}.bin", name)),
             ProverServiceDataType::PlonkSetupData => {
-                self.basedir.join(format!("plonk_setup_{}_data.bin", name))
+                self.setup_data_path.join(format!("plonk_setup_{}_data.bin", name))
             }
             ProverServiceDataType::FflonkSetupData => {
-                self.basedir.join(format!("fflonk_setup_{}_data.bin", name))
+                self.setup_data_path.join(format!("fflonk_setup_{}_data.bin", name))
             }
             ProverServiceDataType::SnarkVerificationKey => {
                 self.basedir.join(format!("verification_{}_key.json", name))
@@ -458,9 +458,9 @@ impl Keystore {
         bincode::deserialize::<GpuProverSetupData<GoldilocksField, CompressionProofsTreeHasher>>(
             &buffer,
         )
-        .with_context(|| {
-            format!("Failed deserializing compression wrapper setup data at path: {filepath:?}")
-        })
+            .with_context(|| {
+                format!("Failed deserializing compression wrapper setup data at path: {filepath:?}")
+            })
     }
 
     #[cfg(any(feature = "gpu", feature = "gpu-light"))]
@@ -487,9 +487,9 @@ impl Keystore {
         bincode::deserialize::<
             GpuProverSetupData<GoldilocksField, CompressionProofsTreeHasherForWrapper>,
         >(&buffer)
-        .with_context(|| {
-            format!("Failed deserializing compression wrapper setup data at path: {filepath:?}")
-        })
+            .with_context(|| {
+                format!("Failed deserializing compression wrapper setup data at path: {filepath:?}")
+            })
     }
 
     #[cfg(feature = "gpu")]
@@ -629,7 +629,7 @@ impl Keystore {
                 .get_recursion_layer_node_vk()
                 .map_err(|err| anyhow::anyhow!("No vk exist for node layer circuit: {err}"))?,
         )
-        .context("save_recursive_layer_vk")?;
+            .context("save_recursive_layer_vk")?;
 
         let node_hint = source
             .get_recursion_layer_node_finalization_hint()
@@ -643,13 +643,13 @@ impl Keystore {
             ),
             &node_hint,
         )
-        .context("save_finalization_hints()")?;
+            .context("save_finalization_hints()")?;
 
         // Recursion tip
         self.save_recursive_layer_verification_key(source.get_recursion_tip_vk().map_err(
             |err| anyhow::anyhow!("No vk exist for recursion tip layer circuit: {err}"),
         )?)
-        .context("save_recursion_tip_vk")?;
+            .context("save_recursion_tip_vk")?;
 
         let recursion_tip_hint = source
             .get_recursion_tip_finalization_hint()
@@ -663,15 +663,15 @@ impl Keystore {
             ),
             &recursion_tip_hint,
         )
-        .context("save_finalization_hints()")?;
+            .context("save_finalization_hints()")?;
 
         // Scheduler
         self.save_recursive_layer_verification_key(
             source
                 .get_recursion_layer_vk(ZkSyncRecursionLayerStorageType::SchedulerCircuit as u8)
                 .map_err(|err| anyhow::anyhow!("No vk exist for scheduler circuit: {err}"))?,
         )
-        .context("save_recursive_layer_vk")?;
+            .context("save_recursive_layer_vk")?;
 
         let scheduler_hint = source
             .get_recursion_layer_finalization_hint(
@@ -688,7 +688,7 @@ impl Keystore {
             ),
             &scheduler_hint,
         )
-        .context("save_finalization_hints()")?;
+            .context("save_finalization_hints()")?;
 
         Ok(())
     }