Move max_constraint_log_degree_bound to AirExt trait.

src/core/air/mod.rs

@@ -20,11 +20,15 @@ pub mod evaluation;
 // TODO(spapini): consider renaming this struct.
 pub trait Air {
     fn visit_components<V: ComponentVisitor>(&self, v: &mut V);
-
-    fn max_constraint_log_degree_bound(&self) -> u32;
 }
 
 pub trait AirExt: Air {
+    fn max_constraint_log_degree_bound(&self) -> u32 {
+        let mut visitor = MaxConstraintLogDegreeBoundVisitor::new();
+        self.visit_components(&mut visitor);
+        visitor.finalize()
+    }
+
     fn compute_composition_polynomial(
         &self,
         random_coeff: SecureField,
@@ -46,6 +50,27 @@ pub trait ComponentVisitor {
     fn visit<C: Component>(&mut self, component: &C);
 }
 
+struct MaxConstraintLogDegreeBoundVisitor(u32);
+
+impl MaxConstraintLogDegreeBoundVisitor {
+    pub fn new() -> Self {
+        Self(0)
+    }
+
+    pub fn finalize(self) -> u32 {
+        self.0
+    }
+}
+
+impl ComponentVisitor for MaxConstraintLogDegreeBoundVisitor {
+    fn visit<C: Component>(&mut self, component: &C) {
+        let bound = component.max_constraint_log_degree_bound();
+        if bound > self.0 {
+            self.0 = bound;
+        }
+    }
+}
+
 /// Holds the mask offsets at each column.
 /// Holds a vector with an entry for each column. Each entry holds the offsets
 /// of the mask at that column.

src/fibonacci/air.rs

@@ -1,5 +1,5 @@
 use super::component::FibonacciComponent;
-use crate::core::air::{Air, Component, ComponentVisitor};
+use crate::core::air::{Air, ComponentVisitor};
 
 pub struct FibonacciAir {
     pub component: FibonacciComponent,
@@ -15,8 +15,4 @@ impl Air for FibonacciAir {
     fn visit_components<V: ComponentVisitor>(&self, v: &mut V) {
         v.visit(&self.component);
     }
-
-    fn max_constraint_log_degree_bound(&self) -> u32 {
-        self.component.max_constraint_log_degree_bound()
-    }
 }

src/fibonacci/mod.rs

@@ -8,7 +8,7 @@ use crate::commitment_scheme::blake2_hash::Blake2sHasher;
 use crate::commitment_scheme::hasher::Hasher;
 use crate::commitment_scheme::merkle_decommitment::MerkleDecommitment;
 use crate::core::air::evaluation::PointEvaluationAccumulator;
-use crate::core::air::{Air, AirExt, Component, ComponentTrace};
+use crate::core::air::{AirExt, Component, ComponentTrace};
 use crate::core::channel::{Blake2sChannel, Channel as ChannelTrait};
 use crate::core::circle::CirclePoint;
 use crate::core::commitment_scheme::{CommitmentSchemeProver, CommitmentSchemeVerifier};
@@ -300,7 +300,7 @@ mod tests {
     use super::Fibonacci;
     use crate::commitment_scheme::utils::tests::generate_test_queries;
     use crate::core::air::evaluation::PointEvaluationAccumulator;
-    use crate::core::air::{Air, AirExt, Component, ComponentTrace};
+    use crate::core::air::{AirExt, Component, ComponentTrace};
     use crate::core::circle::CirclePoint;
     use crate::core::fields::m31::{BaseField, M31};
     use crate::core::fields::qm31::SecureField;