From bce3256c96ce41861f487ccf09d6e02f67ddd1e0 Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Mon, 4 Oct 2021 10:21:35 +0200
Subject: [PATCH] PR feedback

---
 src/fri/recursive_verifier.rs | 2 +-
 src/fri/verifier.rs           | 3 +--
 src/util/serialization.rs     | 4 +++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/fri/recursive_verifier.rs b/src/fri/recursive_verifier.rs
index 142d1e24..78d5f007 100644
--- a/src/fri/recursive_verifier.rs
+++ b/src/fri/recursive_verifier.rs
@@ -88,7 +88,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         );
 
         // Size of the LDE domain.
-        let n = 1 << (common_data.degree_bits + config.rate_bits);
+        let n = common_data.lde_size();
 
         challenger.observe_opening_set(os);
 
diff --git a/src/fri/verifier.rs b/src/fri/verifier.rs
index efbd733b..f9c1d998 100644
--- a/src/fri/verifier.rs
+++ b/src/fri/verifier.rs
@@ -64,14 +64,13 @@ pub(crate) fn verify_fri_proof<F: RichField + Extendable<D>, const D: usize>(
     common_data: &CommonCircuitData<F, D>,
 ) -> Result<()> {
     let config = &common_data.config;
-    let total_arities = config.fri_config.total_arities();
     ensure!(
         common_data.final_poly_len() == proof.final_poly.len(),
         "Final polynomial has wrong degree."
     );
 
     // Size of the LDE domain.
-    let n = 1 << (common_data.degree_bits + config.rate_bits);
+    let n = common_data.lde_size();
 
     // Check PoW.
     fri_verify_proof_of_work(challenges.fri_pow_response, &config.fri_config)?;
diff --git a/src/util/serialization.rs b/src/util/serialization.rs
index b3737363..21b12c11 100644
--- a/src/util/serialization.rs
+++ b/src/util/serialization.rs
@@ -525,7 +525,9 @@ impl Buffer {
         common_data: &CommonCircuitData<F, D>,
     ) -> Result<CompressedProofWithPublicInputs<F, D>> {
         let proof = self.read_compressed_proof(common_data)?;
-        let public_inputs = self.read_field_vec(self.len() - self.0.position() as usize)?;
+        let public_inputs = self.read_field_vec(
+            (self.len() - self.0.position() as usize) / std::mem::size_of::<u64>(),
+        )?;
 
         Ok(CompressedProofWithPublicInputs {
             proof,