feat: add next_phase function to Layouter

halo2_proofs/src/circuit.rs

@@ -444,6 +444,10 @@ pub trait Layouter<F: Field> {
     /// absolute position.
     fn constrain_instance(&mut self, cell: Cell, column: Column<Instance>, row: usize);
 
+    /// Commit advice columns in current phase and squeeze challenges.
+    /// This can be called DURING synthesize.
+    fn next_phase(&mut self);
+
     /// Queries the value of the given challenge.
     ///
     /// Returns `Value::unknown()` if the current synthesis phase is before the challenge can be queried.
@@ -513,6 +517,10 @@ impl<'a, F: Field, L: Layouter<F> + 'a> Layouter<F> for NamespacedLayouter<'a, F
         self.0.get_challenge(challenge)
     }
 
+    fn next_phase(&mut self) {
+        self.0.next_phase();
+    }
+
     fn get_root(&mut self) -> &mut Self::Root {
         self.0.get_root()
     }

halo2_proofs/src/circuit/floor_planner/single_pass.rs

@@ -218,6 +218,10 @@ impl<'a, F: Field, CS: Assignment<F> + 'a + SyncDeps> Layouter<F>
         self.cs.get_challenge(challenge)
     }
 
+    fn next_phase(&mut self) {
+        self.cs.next_phase();
+    }
+
     fn get_root(&mut self) -> &mut Self::Root {
         self
     }

halo2_proofs/src/dev.rs

@@ -1240,11 +1240,7 @@ impl<F: FromUniformBytes<64> + Ord> MockProver<F> {
                 advice
                     .iter()
                     .map(|rc| match *rc {
-                        AdviceCellValue::Assigned(ref a) => CellValue::Assigned(match a.as_ref() {
-                            Assigned::Trivial(a) => *a,
-                            Assigned::Rational(a, b) => *a * b.invert().unwrap(),
-                            _ => F::ZERO,
-                        }),
+                        AdviceCellValue::Assigned(ref a) => CellValue::Assigned(a.evaluate()),
                         AdviceCellValue::Poison(i) => CellValue::Poison(i),
                     })
                     .collect::<Vec<_>>()