fix: dev-graph

axiom-crypto · Aug 13, 2023 · 05bdea1 · 05bdea1
1 parent 839ccb7
commit 05bdea1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 66 deletions.
diff --git a/halo2_proofs/src/dev/graph.rs b/halo2_proofs/src/dev/graph.rs
@@ -116,49 +116,24 @@ impl<F: Field> Assignment<F> for Graph {
         Ok(Value::unknown())
     }
 
-    fn assign_advice<V, VR, A, AR>(
+    fn assign_advice<'v>(
+        //V, VR, A, AR>(
         &mut self,
-        _: A,
+        //_: A,
         _: Column<Advice>,
         _: usize,
-        _: V,
-    ) -> Result<(), Error>
-    where
-        V: FnOnce() -> Value<VR>,
-        VR: Into<Assigned<F>>,
-        A: FnOnce() -> AR,
-        AR: Into<String>,
-    {
+        _: Value<Assigned<F>>,
+    ) -> Value<&'v Assigned<F>> {
         // Do nothing; we don't care about cells in this context.
-        Ok(())
+        Value::unknown()
     }
 
-    fn assign_fixed<V, VR, A, AR>(
-        &mut self,
-        _: A,
-        _: Column<Fixed>,
-        _: usize,
-        _: V,
-    ) -> Result<(), Error>
-    where
-        V: FnOnce() -> Value<VR>,
-        VR: Into<Assigned<F>>,
-        A: FnOnce() -> AR,
-        AR: Into<String>,
-    {
+    fn assign_fixed(&mut self, _: Column<Fixed>, _: usize, _: Assigned<F>) {
         // Do nothing; we don't care about cells in this context.
-        Ok(())
     }
 
-    fn copy(
-        &mut self,
-        _: Column<Any>,
-        _: usize,
-        _: Column<Any>,
-        _: usize,
-    ) -> Result<(), crate::plonk::Error> {
+    fn copy(&mut self, _: Column<Any>, _: usize, _: Column<Any>, _: usize) {
         // Do nothing; we don't care about permutations in this context.
-        Ok(())
     }
 
     fn fill_from_row(

diff --git a/halo2_proofs/src/dev/graph/layout.rs b/halo2_proofs/src/dev/graph/layout.rs
@@ -441,49 +441,22 @@ impl<F: Field> Assignment<F> for Layout {
         Ok(Value::unknown())
     }
 
-    fn assign_advice<V, VR, A, AR>(
+    fn assign_advice<'v>(
         &mut self,
-        _: A,
         column: Column<Advice>,
         row: usize,
-        _: V,
-    ) -> Result<(), Error>
-    where
-        V: FnOnce() -> Value<VR>,
-        VR: Into<Assigned<F>>,
-        A: FnOnce() -> AR,
-        AR: Into<String>,
-    {
+        _: Value<Assigned<F>>,
+    ) -> Value<&'v Assigned<F>> {
         self.update(Column::<Any>::from(column).into(), row);
-        Ok(())
+        Value::unknown()
     }
 
-    fn assign_fixed<V, VR, A, AR>(
-        &mut self,
-        _: A,
-        column: Column<Fixed>,
-        row: usize,
-        _: V,
-    ) -> Result<(), Error>
-    where
-        V: FnOnce() -> Value<VR>,
-        VR: Into<Assigned<F>>,
-        A: FnOnce() -> AR,
-        AR: Into<String>,
-    {
+    fn assign_fixed(&mut self, column: Column<Fixed>, row: usize, _: Assigned<F>) {
         self.update(Column::<Any>::from(column).into(), row);
-        Ok(())
     }
 
-    fn copy(
-        &mut self,
-        l_col: Column<Any>,
-        l_row: usize,
-        r_col: Column<Any>,
-        r_row: usize,
-    ) -> Result<(), crate::plonk::Error> {
+    fn copy(&mut self, l_col: Column<Any>, l_row: usize, r_col: Column<Any>, r_row: usize) {
         self.equality.push((l_col, l_row, r_col, r_row));
-        Ok(())
     }
 
     fn fill_from_row(