fmt

a16z · Oct 31, 2024 · 124f0df · 124f0df
1 parent dcbd290
commit 124f0df
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 19 deletions.
diff --git a/jolt-core/src/benches/bench.rs b/jolt-core/src/benches/bench.rs
@@ -131,7 +131,14 @@ where
         let (io_device, trace) = program.trace();
 
         let preprocessing: crate::jolt::vm::JoltPreprocessing<C, F, PCS, ProofTranscript> =
-            RV32IJoltVM::preprocess(bytecode.clone(), io_device, memory_init, 1 << 20, 1 << 20, 1 << 22);
+            RV32IJoltVM::preprocess(
+                bytecode.clone(),
+                io_device,
+                memory_init,
+                1 << 20,
+                1 << 20,
+                1 << 22,
+            );
 
         let (jolt_proof, jolt_commitments, _) =
             <RV32IJoltVM as Jolt<_, PCS, C, M, ProofTranscript>>::prove(
@@ -186,7 +193,14 @@ where
         let (io_device, trace) = program.trace();
 
         let preprocessing: crate::jolt::vm::JoltPreprocessing<C, F, PCS, ProofTranscript> =
-            RV32IJoltVM::preprocess(bytecode.clone(), io_device, memory_init, 1 << 20, 1 << 20, 1 << 22);
+            RV32IJoltVM::preprocess(
+                bytecode.clone(),
+                io_device,
+                memory_init,
+                1 << 20,
+                1 << 20,
+                1 << 22,
+            );
 
         let (jolt_proof, jolt_commitments, _) =
             <RV32IJoltVM as Jolt<_, PCS, C, M, ProofTranscript>>::prove(

diff --git a/jolt-core/src/jolt/vm/mod.rs b/jolt-core/src/jolt/vm/mod.rs
@@ -539,11 +539,16 @@ where
             opening_accumulator
                 .compare_to(debug_info.opening_accumulator, &preprocessing.generators);
         }
-        Self::fiat_shamir_preamble(&mut transcript, &preprocessing.program_io, proof.trace_length);
+        Self::fiat_shamir_preamble(
+            &mut transcript,
+            &preprocessing.program_io,
+            proof.trace_length,
+        );
 
         // Regenerate the uniform Spartan key
         let padded_trace_length = proof.trace_length.next_power_of_two();
-        let memory_start = RAM_START_ADDRESS - preprocessing.program_io.memory_layout.ram_witness_offset;
+        let memory_start =
+            RAM_START_ADDRESS - preprocessing.program_io.memory_layout.ram_witness_offset;
         let r1cs_builder =
             Self::Constraints::construct_constraints(padded_trace_length, memory_start);
         let spartan_key = spartan::UniformSpartanProof::<C, _, F, ProofTranscript>::setup(

diff --git a/jolt-core/src/jolt/vm/rv32i_vm.rs b/jolt-core/src/jolt/vm/rv32i_vm.rs
@@ -312,8 +312,14 @@ mod tests {
         let (io_device, trace) = program.trace();
         drop(artifact_guard);
 
-        let preprocessing =
-            RV32IJoltVM::preprocess(bytecode.clone(), io_device, memory_init, 1 << 20, 1 << 20, 1 << 20);
+        let preprocessing = RV32IJoltVM::preprocess(
+            bytecode.clone(),
+            io_device,
+            memory_init,
+            1 << 20,
+            1 << 20,
+            1 << 20,
+        );
         let (proof, commitments, debug_info) =
             <RV32IJoltVM as Jolt<F, PCS, C, M, ProofTranscript>>::prove(
                 trace,
@@ -370,8 +376,14 @@ mod tests {
         let (bytecode, memory_init) = program.decode();
         let (io_device, trace) = program.trace();
 
-        let preprocessing =
-            RV32IJoltVM::preprocess(bytecode.clone(), io_device, memory_init, 1 << 20, 1 << 20, 1 << 20);
+        let preprocessing = RV32IJoltVM::preprocess(
+            bytecode.clone(),
+            io_device,
+            memory_init,
+            1 << 20,
+            1 << 20,
+            1 << 20,
+        );
         let (jolt_proof, jolt_commitments, debug_info) =
             <RV32IJoltVM as Jolt<
                 _,
@@ -400,8 +412,14 @@ mod tests {
         let (io_device, trace) = program.trace();
         drop(guard);
 
-        let preprocessing =
-            RV32IJoltVM::preprocess(bytecode.clone(), io_device, memory_init, 1 << 20, 1 << 20, 1 << 20);
+        let preprocessing = RV32IJoltVM::preprocess(
+            bytecode.clone(),
+            io_device,
+            memory_init,
+            1 << 20,
+            1 << 20,
+            1 << 20,
+        );
         let (jolt_proof, jolt_commitments, debug_info) =
             <RV32IJoltVM as Jolt<
                 _,
@@ -430,8 +448,14 @@ mod tests {
         let (io_device, trace) = program.trace();
         drop(guard);
 
-        let preprocessing =
-            RV32IJoltVM::preprocess(bytecode.clone(), io_device, memory_init, 1 << 20, 1 << 20, 1 << 20);
+        let preprocessing = RV32IJoltVM::preprocess(
+            bytecode.clone(),
+            io_device,
+            memory_init,
+            1 << 20,
+            1 << 20,
+            1 << 20,
+        );
         let (jolt_proof, jolt_commitments, debug_info) = <RV32IJoltVM as Jolt<
             _,
             Zeromorph<Bn254, KeccakTranscript>,
@@ -461,8 +485,14 @@ mod tests {
         let (io_device, trace) = program.trace();
         drop(guard);
 
-        let preprocessing =
-            RV32IJoltVM::preprocess(bytecode.clone(), io_device, memory_init, 1 << 20, 1 << 20, 1 << 20);
+        let preprocessing = RV32IJoltVM::preprocess(
+            bytecode.clone(),
+            io_device,
+            memory_init,
+            1 << 20,
+            1 << 20,
+            1 << 20,
+        );
         let (jolt_proof, jolt_commitments, debug_info) = <RV32IJoltVM as Jolt<
             _,
             HyperKZG<Bn254, KeccakTranscript>,
@@ -494,17 +524,21 @@ mod tests {
         io_device.outputs[0] = 0; // change the output to 0
         drop(artifact_guard);
 
-        let preprocessing =
-            RV32IJoltVM::preprocess(bytecode.clone(), io_device, memory_init, 1 << 20, 1 << 20, 1 << 20);
+        let preprocessing = RV32IJoltVM::preprocess(
+            bytecode.clone(),
+            io_device,
+            memory_init,
+            1 << 20,
+            1 << 20,
+            1 << 20,
+        );
         let (proof, commitments, debug_info) = <RV32IJoltVM as Jolt<
             Fr,
             HyperKZG<Bn254, KeccakTranscript>,
             C,
             M,
             KeccakTranscript,
-        >>::prove(
-            trace, preprocessing.clone()
-        );
+        >>::prove(trace, preprocessing.clone());
         let verification_result =
             RV32IJoltVM::verify(preprocessing, proof, commitments, debug_info);
         assert!(