From 67cb5dfd5880ffc8a080bd22f63c62f0d83fd7e4 Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Thu, 17 Feb 2022 08:26:23 +0100
Subject: [PATCH] PR feedback

---
 plonky2/src/fri/mod.rs                  | 1 +
 plonky2/src/fri/reduction_strategies.rs | 7 ++++---
 plonky2/src/plonk/circuit_data.rs       | 2 +-
 starky/src/config.rs                    | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/plonky2/src/fri/mod.rs b/plonky2/src/fri/mod.rs
index 5792444e..4ed2ea3b 100644
--- a/plonky2/src/fri/mod.rs
+++ b/plonky2/src/fri/mod.rs
@@ -35,6 +35,7 @@ impl FriConfig {
         let reduction_arity_bits = self.reduction_strategy.reduction_arity_bits(
             degree_bits,
             self.rate_bits,
+            self.cap_height,
             self.num_query_rounds,
         );
         FriParams {
diff --git a/plonky2/src/fri/reduction_strategies.rs b/plonky2/src/fri/reduction_strategies.rs
index d81ac2ae..4252564e 100644
--- a/plonky2/src/fri/reduction_strategies.rs
+++ b/plonky2/src/fri/reduction_strategies.rs
@@ -8,12 +8,12 @@ pub enum FriReductionStrategy {
     /// Specifies the exact sequence of arities (expressed in bits) to use.
     Fixed(Vec<usize>),
 
-    /// `ConstantArityBits(arity_bits, final_poly_bits, cap_height)` applies reductions of arity `2^arity_bits`
+    /// `ConstantArityBits(arity_bits, final_poly_bits)` applies reductions of arity `2^arity_bits`
     /// until the polynomial degree is less than or equal to `2^final_poly_bits` or until any further
     /// `arity_bits`-reduction makes the last FRI tree have height less than `cap_height`.
     /// This tends to work well in the recursive setting, as it avoids needing multiple configurations
     /// of gates used in FRI verification, such as `InterpolationGate`.
-    ConstantArityBits(usize, usize, usize),
+    ConstantArityBits(usize, usize),
 
     /// `MinSize(opt_max_arity_bits)` searches for an optimal sequence of reduction arities, with an
     /// optional max `arity_bits`. If this proof will have recursive proofs on top of it, a max
@@ -27,12 +27,13 @@ impl FriReductionStrategy {
         &self,
         mut degree_bits: usize,
         rate_bits: usize,
+        cap_height: usize,
         num_queries: usize,
     ) -> Vec<usize> {
         match self {
             FriReductionStrategy::Fixed(reduction_arity_bits) => reduction_arity_bits.to_vec(),
 
-            &FriReductionStrategy::ConstantArityBits(arity_bits, final_poly_bits, cap_height) => {
+            &FriReductionStrategy::ConstantArityBits(arity_bits, final_poly_bits) => {
                 let mut result = Vec::new();
                 while degree_bits > final_poly_bits
                     && degree_bits + rate_bits - arity_bits >= cap_height
diff --git a/plonky2/src/plonk/circuit_data.rs b/plonky2/src/plonk/circuit_data.rs
index fdec495e..3d4ee2df 100644
--- a/plonky2/src/plonk/circuit_data.rs
+++ b/plonky2/src/plonk/circuit_data.rs
@@ -73,7 +73,7 @@ impl CircuitConfig {
                 rate_bits: 3,
                 cap_height: 4,
                 proof_of_work_bits: 16,
-                reduction_strategy: FriReductionStrategy::ConstantArityBits(4, 5, 4),
+                reduction_strategy: FriReductionStrategy::ConstantArityBits(4, 5),
                 num_query_rounds: 28,
             },
         }
diff --git a/starky/src/config.rs b/starky/src/config.rs
index 2e2cced7..500cd957 100644
--- a/starky/src/config.rs
+++ b/starky/src/config.rs
@@ -22,7 +22,7 @@ impl StarkConfig {
                 rate_bits: 1,
                 cap_height: 4,
                 proof_of_work_bits: 10,
-                reduction_strategy: FriReductionStrategy::ConstantArityBits(4, 5, 4),
+                reduction_strategy: FriReductionStrategy::ConstantArityBits(4, 5),
                 num_query_rounds: 90,
             },
         }