From 58e1febde7deefe99a649e8bfbec5270c5de87d4 Mon Sep 17 00:00:00 2001
From: Daniel Lubarov <daniel@lubarov.com>
Date: Mon, 6 Dec 2021 00:04:01 -0800
Subject: [PATCH] Update size-optimized recursion test (#388)

I think it should start with `standard_recursion_config`, since the goal of the test is to start with a regular speed-optimized recursive proof and shrink it.

The final proof is a bit larger now, mainly because of the update to 100 bits, and partly (less importantly) because it starts with the now-standard arity 16. We could maybe switch from arity 16 to 8 somewhere in the chain, but I think that might require another proof layer, and didn't want to complicate it too much.
---
 src/plonk/circuit_data.rs       | 13 -------------
 src/plonk/recursive_verifier.rs | 14 +++++++-------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/plonk/circuit_data.rs b/src/plonk/circuit_data.rs
index bf8024df..f0451131 100644
--- a/src/plonk/circuit_data.rs
+++ b/src/plonk/circuit_data.rs
@@ -76,19 +76,6 @@ impl CircuitConfig {
         }
     }
 
-    pub fn size_optimized_recursion_config() -> Self {
-        Self {
-            security_bits: 93,
-            cap_height: 3,
-            fri_config: FriConfig {
-                reduction_strategy: FriReductionStrategy::ConstantArityBits(3, 5),
-                num_query_rounds: 26,
-                ..CircuitConfig::standard_recursion_config().fri_config
-            },
-            ..CircuitConfig::standard_recursion_config()
-        }
-    }
-
     pub fn standard_recursion_zk_config() -> Self {
         CircuitConfig {
             zero_knowledge: true,
diff --git a/src/plonk/recursive_verifier.rs b/src/plonk/recursive_verifier.rs
index 46ca5e6a..0a03fab0 100644
--- a/src/plonk/recursive_verifier.rs
+++ b/src/plonk/recursive_verifier.rs
@@ -408,7 +408,7 @@ mod tests {
         type F = GoldilocksField;
         const D: usize = 2;
 
-        let standard_config = CircuitConfig::size_optimized_recursion_config();
+        let standard_config = CircuitConfig::standard_recursion_config();
 
         // An initial dummy proof.
         let (proof, vd, cd) = dummy_proof::<F, D>(&standard_config, 4_000)?;
@@ -432,7 +432,7 @@ mod tests {
             rate_bits: 7,
             fri_config: FriConfig {
                 proof_of_work_bits: 16,
-                num_query_rounds: 11,
+                num_query_rounds: 12,
                 ..standard_config.fri_config.clone()
             },
             ..standard_config
@@ -453,11 +453,11 @@ mod tests {
         let final_config = CircuitConfig {
             cap_height: 0,
             rate_bits: 8,
-            num_routed_wires: 25,
+            num_routed_wires: 37,
             fri_config: FriConfig {
-                proof_of_work_bits: 21,
-                reduction_strategy: FriReductionStrategy::MinSize(Some(3)),
-                num_query_rounds: 9,
+                proof_of_work_bits: 20,
+                reduction_strategy: FriReductionStrategy::MinSize(None),
+                num_query_rounds: 10,
             },
             ..high_rate_config
         };
@@ -471,7 +471,7 @@ mod tests {
             true,
             true,
         )?;
-        assert_eq!(cd.degree_bits, 12);
+        assert_eq!(cd.degree_bits, 12, "final proof too large");
 
         test_serialization(&proof, &cd)?;