address PR feedback

common/src/prover_state/circuit.rs

@@ -11,7 +11,9 @@ use proof_gen::types::AllRecursiveCircuits;
 use crate::parsing::{parse_range, RangeParseError};
 
 /// Number of tables defined in plonky2.
-pub const NUM_TABLES: usize = 7;
+///
+/// TODO: This should be made public in the evm_arithmetization crate.
+pub(crate) const NUM_TABLES: usize = 7;
 
 /// New type wrapper for [`Range`] that implements [`FromStr`] and [`Display`].
 ///

common/src/prover_state/mod.rs

@@ -13,10 +13,7 @@
 //!   [`set_prover_state_from_config`] function.
 use std::sync::OnceLock;
 
-use evm_arithmetization::{
-    fixed_recursive_verifier::RecursiveCircuitsForTableSize, proof::AllProof, prover::prove,
-    AllStark, StarkConfig,
-};
+use evm_arithmetization::{proof::AllProof, prover::prove, AllStark, StarkConfig};
 use plonky2::{
     field::goldilocks_field::GoldilocksField, plonk::config::PoseidonGoldilocksConfig,
     util::timing::TimingTree,
@@ -39,6 +36,13 @@ pub(crate) type Config = PoseidonGoldilocksConfig;
 pub(crate) type Field = GoldilocksField;
 pub(crate) const SIZE: usize = 2;
 
+pub(crate) type RecursiveCircuitsForTableSize =
+    evm_arithmetization::fixed_recursive_verifier::RecursiveCircuitsForTableSize<
+        Field,
+        Config,
+        SIZE,
+    >;
+
 /// The global prover state.
 ///
 /// It is specified as a `OnceLock` for the following reasons:
@@ -117,15 +121,13 @@ impl ProverStateManager {
     /// Using this information, for each circuit, a tuple is returned,
     /// containing:
     /// 1. The loaded table circuit at the specified size.
-    /// 2. An offset indicating the distance of the specified size relative to
-    ///    the configured range used to pre-process the circuits.
-    #[allow(clippy::type_complexity)]
+    /// 2. An offset indicating the position of the specified size within the
+    ///    configured range used when pre-generating the circuits.
     fn load_table_circuits(
         &self,
         config: &StarkConfig,
         all_proof: &AllProof<Field, Config, SIZE>,
-    ) -> anyhow::Result<[(RecursiveCircuitsForTableSize<Field, Config, SIZE>, u8); NUM_TABLES]>
-    {
+    ) -> anyhow::Result<[(RecursiveCircuitsForTableSize, u8); NUM_TABLES]> {
         let degrees = all_proof.degree_bits(config);
 
         /// Given a recursive circuit index (e.g., Arithmetic / 0), return a

common/src/prover_state/persistence.rs

@@ -5,7 +5,6 @@ use std::{
     path::Path,
 };
 
-use evm_arithmetization::fixed_recursive_verifier::RecursiveCircuitsForTableSize;
 use plonky2::util::serialization::{
     Buffer, DefaultGateSerializer, DefaultGeneratorSerializer, IoError,
 };
@@ -14,7 +13,7 @@ use thiserror::Error;
 
 use super::{
     circuit::{Circuit, CircuitConfig},
-    Config, Field, SIZE,
+    Config, RecursiveCircuitsForTableSize, SIZE,
 };
 
 const PROVER_STATE_FILE_PREFIX: &str = "./prover_state";
@@ -154,7 +153,7 @@ impl DiskResource for MonolithicProverResource {
 pub(crate) struct RecursiveCircuitResource;
 
 impl DiskResource for RecursiveCircuitResource {
-    type Resource = RecursiveCircuitsForTableSize<Field, Config, SIZE>;
+    type Resource = RecursiveCircuitsForTableSize;
     type Error = IoError;
     type PathConstrutor = (Circuit, usize);
 
@@ -179,8 +178,7 @@ impl DiskResource for RecursiveCircuitResource {
 
     fn deserialize(
         bytes: &[u8],
-    ) -> Result<RecursiveCircuitsForTableSize<Field, Config, SIZE>, DiskResourceError<Self::Error>>
-    {
+    ) -> Result<RecursiveCircuitsForTableSize, DiskResourceError<Self::Error>> {
         let (gate_serializer, witness_serializer) = get_serializers();
         let mut buffer = Buffer::new(bytes);
         RecursiveCircuitsForTableSize::from_buffer(