- make self in query_instance mutable

  allows the keygen to compute size of advice cols
- remove evaluation.rs
- Add comments
- Compute all column sizes during keygen

halo2_proofs/src/dev.rs

@@ -404,7 +404,7 @@ impl<F: Field> Assignment<F> for MockProver<F> {
     }
 
     fn query_instance(
-        &self,
+        &mut self,
         column: Column<Instance>,
         row: usize,
     ) -> Result<circuit::Value<F>, Error> {

halo2_proofs/src/dev/cost.rs

@@ -71,7 +71,7 @@ impl<F: Field> Assignment<F> for Assembly {
         Ok(())
     }
 
-    fn query_instance(&self, _: Column<Instance>, _: usize) -> Result<Value<F>, Error> {
+    fn query_instance(&mut self, _: Column<Instance>, _: usize) -> Result<Value<F>, Error> {
         Ok(Value::unknown())
     }
 

halo2_proofs/src/dev/graph.rs

@@ -112,7 +112,7 @@ impl<F: Field> Assignment<F> for Graph {
         // Do nothing
     }
 
-    fn query_instance(&self, _: Column<Instance>, _: usize) -> Result<Value<F>, Error> {
+    fn query_instance(&mut self, _: Column<Instance>, _: usize) -> Result<Value<F>, Error> {
         Ok(Value::unknown())
     }
 

halo2_proofs/src/dev/graph/layout.rs

@@ -437,7 +437,7 @@ impl<F: Field> Assignment<F> for Layout {
         Ok(())
     }
 
-    fn query_instance(&self, _: Column<Instance>, _: usize) -> Result<Value<F>, Error> {
+    fn query_instance(&mut self, _: Column<Instance>, _: usize) -> Result<Value<F>, Error> {
         Ok(Value::unknown())
     }
 

halo2_proofs/src/plonk/circuit.rs

@@ -652,7 +652,7 @@ pub trait Assignment<F: Field> {
     /// Queries the cell of an instance column at a particular absolute row.
     ///
     /// Returns the cell's value, if known.
-    fn query_instance(&self, column: Column<Instance>, row: usize) -> Result<Value<F>, Error>;
+    fn query_instance(&mut self, column: Column<Instance>, row: usize) -> Result<Value<F>, Error>;
 
     /// Assign an advice column value (witness)
     fn assign_advice<V, VR, A, AR>(

halo2_proofs/src/plonk/keygen.rs

@@ -90,7 +90,7 @@ impl<F: Field> Assignment<F> for Assembly<F> {
         Ok(())
     }
 
-    fn query_instance(&self, _: Column<Instance>, row: usize) -> Result<Value<F>, Error> {
+    fn query_instance(&mut self, _: Column<Instance>, row: usize) -> Result<Value<F>, Error> {
         if !self.usable_rows.contains(&row) {
             return Err(Error::not_enough_rows_available(self.k));
         }

halo2_proofs/src/plonk/prover.rs

@@ -187,7 +187,11 @@ where
             // Do nothing
         }
 
-        fn query_instance(&self, column: Column<Instance>, row: usize) -> Result<Value<F>, Error> {
+        fn query_instance(
+            &mut self,
+            column: Column<Instance>,
+            row: usize,
+        ) -> Result<Value<F>, Error> {
             if !self.usable_rows.contains(&row) {
                 return Err(Error::not_enough_rows_available(self.k));
             }

halo2_proofs/src/protostar.rs

@@ -1,7 +1,6 @@
 //! Contains logic for handling halo2 circuits with Protostar
 
 mod error_check;
-mod evaluation;
 mod gate;
 mod keygen;
 mod prover;