Move SHA-256 gadget and chip into examples

Cargo.toml

@@ -38,10 +38,6 @@ harness = false
 name = "plonk"
 harness = false
 
-[[bench]]
-name = "sha256"
-harness = false
-
 [dependencies]
 backtrace = { version = "0.3", optional = true }
 subtle = "2.3"

examples/sha256/benches.rs

@@ -1,12 +1,7 @@
-#[macro_use]
-extern crate criterion;
-
-extern crate halo2;
 use halo2::{
     arithmetic::FieldExt,
     circuit::Chip,
     circuit::{layouter, Layouter},
-    gadget::sha256::{BlockWord, Sha256, Table16Chip, Table16Config, BLOCK_SIZE},
     pasta::EqAffine,
     plonk::{
         create_proof, keygen_pk, keygen_vk, verify_proof, Assignment, Circuit, ConstraintSystem,
@@ -22,7 +17,9 @@ use std::{
     path::Path,
 };
 
-use criterion::Criterion;
+use criterion::{criterion_group, criterion_main, Criterion};
+
+use crate::{BlockWord, Sha256, Table16Chip, Table16Config, BLOCK_SIZE};
 
 fn bench(name: &str, k: u32, c: &mut Criterion) {
     struct MyCircuit {}

examples/sha256/main.rs

@@ -6,11 +6,12 @@ use std::cmp::min;
 use std::convert::TryInto;
 use std::fmt;
 
-use crate::{
+use halo2::{
     circuit::{Chip, Layouter},
     plonk::Error,
 };
 
+mod benches;
 mod table16;
 
 pub use table16::{BlockWord, Table16Chip, Table16Config};
@@ -157,3 +158,5 @@ impl<Sha256Chip: Sha256Instructions> Sha256<Sha256Chip> {
         hasher.finalize(layouter.namespace(|| "finalize"))
     }
 }
+
+fn main() {}

examples/sha256/table16.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 
 use super::Sha256Instructions;
-use crate::{
+use halo2::{
     arithmetic::FieldExt,
     circuit::{Cell, Chip, Layouter, Region},
     plonk::{Advice, Column, ConstraintSystem, Error, Permutation},
@@ -324,7 +324,7 @@ trait Table16Assignment<F: FieldExt> {
 #[cfg(test)]
 mod tests {
     #[cfg(feature = "dev-graph")]
-    use crate::{
+    use halo2::{
         arithmetic::FieldExt,
         circuit::Chip,
         circuit::{layouter, Layouter},

examples/sha256/table16/compression.rs

@@ -2,7 +2,7 @@ use super::{
     super::DIGEST_SIZE, BlockWord, CellValue16, CellValue32, SpreadInputs, SpreadVar,
     Table16Assignment, Table16Chip, ROUNDS, STATE,
 };
-use crate::{
+use halo2::{
     arithmetic::FieldExt,
     circuit::Layouter,
     plonk::{Advice, Column, ConstraintSystem, Error, Fixed, Permutation},
@@ -800,7 +800,7 @@ mod tests {
         Table16Chip, Table16Config, IV,
     };
     use super::Compression;
-    use crate::{
+    use halo2::{
         arithmetic::FieldExt,
         circuit::{layouter, Layouter},
         dev::MockProver,

examples/sha256/table16/compression/compression_gates.rs

@@ -1,6 +1,5 @@
 use super::super::{util::*, Gate};
-use crate::arithmetic::FieldExt;
+use halo2::{arithmetic::FieldExt, plonk::Expression};
-use crate::plonk::Expression;
 
 pub struct CompressionGate<F: FieldExt>(pub Expression<F>);
 

examples/sha256/table16/compression/compression_util.rs

@@ -5,7 +5,7 @@ use super::super::{
 use super::{
     AbcdVar, Compression, EfghVar, RoundWordA, RoundWordDense, RoundWordE, RoundWordSpread, State,
 };
-use crate::{
+use halo2::{
     arithmetic::FieldExt,
     circuit::Region,
     plonk::{Advice, Column, Error},

examples/sha256/table16/compression/subregion_digest.rs

@@ -1,6 +1,6 @@
 use super::super::{super::DIGEST_SIZE, BlockWord, CellValue16, Table16Assignment, Table16Chip};
 use super::{compression_util::*, Compression, State};
-use crate::{
+use halo2::{
     arithmetic::FieldExt,
     circuit::Region,
     plonk::{Advice, Column, Error},

examples/sha256/table16/compression/subregion_initial.rs

@@ -1,6 +1,6 @@
 use super::super::{RoundWordDense, RoundWordSpread, StateWord, Table16Chip, STATE};
 use super::{compression_util::*, Compression, State};
-use crate::{arithmetic::FieldExt, circuit::Region, plonk::Error};
+use halo2::{arithmetic::FieldExt, circuit::Region, plonk::Error};
 
 impl Compression {
     pub fn initialize_iv<F: FieldExt>(

examples/sha256/table16/compression/subregion_main.rs

@@ -2,7 +2,7 @@ use super::super::{
     CellValue16, RoundWordA, RoundWordE, StateWord, Table16Assignment, Table16Chip, ROUND_CONSTANTS,
 };
 use super::{compression_util::*, Compression, State};
-use crate::{arithmetic::FieldExt, circuit::Region, plonk::Error};
+use halo2::{arithmetic::FieldExt, circuit::Region, plonk::Error};
 
 impl Compression {
     pub fn assign_round<F: FieldExt>(

examples/sha256/table16/gates.rs

@@ -1,5 +1,4 @@
-use crate::arithmetic::FieldExt;
+use halo2::{arithmetic::FieldExt, plonk::Expression};
-use crate::plonk::Expression;
 
 pub struct Gate<F: FieldExt>(pub Expression<F>);
 

examples/sha256/table16/message_schedule.rs

@@ -3,7 +3,7 @@ use std::convert::TryInto;
 use super::{
     super::BLOCK_SIZE, BlockWord, CellValue16, SpreadInputs, Table16Assignment, Table16Chip, ROUNDS,
 };
-use crate::{
+use halo2::{
     arithmetic::FieldExt,
     circuit::{Cell, Layouter},
     plonk::{Advice, Column, ConstraintSystem, Error, Fixed, Permutation},
@@ -479,7 +479,7 @@ mod tests {
         super::BLOCK_SIZE, BlockWord, Compression, SpreadTable, Table16Chip, Table16Config,
     };
     use super::{schedule_util::*, MessageSchedule};
-    use crate::{
+    use halo2::{
         arithmetic::FieldExt,
         circuit::{layouter, Layouter},
         dev::MockProver,

examples/sha256/table16/message_schedule/schedule_gates.rs

@@ -1,6 +1,5 @@
 use super::super::Gate;
-use crate::arithmetic::FieldExt;
+use halo2::{arithmetic::FieldExt, plonk::Expression};
-use crate::plonk::Expression;
 
 pub struct ScheduleGate<F: FieldExt>(pub Expression<F>);
 

examples/sha256/table16/message_schedule/schedule_util.rs

@@ -1,6 +1,6 @@
 use super::super::{super::BLOCK_SIZE, BlockWord, CellValue16, Table16Chip, ROUNDS};
 use super::MessageSchedule;
-use crate::{
+use halo2::{
     arithmetic::FieldExt,
     circuit::{Cell, Region},
     plonk::Error,

examples/sha256/table16/message_schedule/subregion1.rs

@@ -3,7 +3,7 @@ use super::super::{
     Table16Chip,
 };
 use super::{schedule_util::*, MessageSchedule};
-use crate::{arithmetic::FieldExt, circuit::Region, plonk::Error};
+use halo2::{arithmetic::FieldExt, circuit::Region, plonk::Error};
 
 // A word in subregion 1
 // (3, 4, 11, 14)-bit chunks

examples/sha256/table16/message_schedule/subregion2.rs

@@ -2,7 +2,7 @@ use super::super::{
     util::*, CellValue16, CellValue32, SpreadVar, SpreadWord, Table16Assignment, Table16Chip,
 };
 use super::{schedule_util::*, MessageSchedule, MessageWord};
-use crate::{arithmetic::FieldExt, circuit::Region, plonk::Error};
+use halo2::{arithmetic::FieldExt, circuit::Region, plonk::Error};
 
 // A word in subregion 2
 // (3, 4, 3, 7, 1, 1, 13)-bit chunks

examples/sha256/table16/message_schedule/subregion3.rs

@@ -2,7 +2,7 @@ use super::super::{
     util::*, CellValue16, CellValue32, SpreadVar, SpreadWord, Table16Assignment, Table16Chip,
 };
 use super::{schedule_util::*, MessageSchedule, MessageWord};
-use crate::{arithmetic::FieldExt, circuit::Region, plonk::Error};
+use halo2::{arithmetic::FieldExt, circuit::Region, plonk::Error};
 
 // A word in subregion 3
 // (10, 7, 2, 13)-bit chunks

examples/sha256/table16/spread_table.rs

@@ -1,5 +1,5 @@
 use super::{util::*, CellValue16, CellValue32, Table16Chip};
-use crate::{
+use halo2::{
     arithmetic::FieldExt,
     circuit::{Chip, Layouter, Region},
     plonk::{Advice, Column, ConstraintSystem, Error, Fixed},
@@ -248,7 +248,7 @@ mod tests {
         super::{util::*, Compression, MessageSchedule, Table16Chip, Table16Config},
         SpreadInputs, SpreadTable,
     };
-    use crate::{
+    use halo2::{
         arithmetic::FieldExt,
         circuit::{layouter, Cell, Layouter, Region, RegionIndex},
         dev::MockProver,

src/gadget.rs

@@ -1,3 +0,0 @@
-//! Self-contained circuit implementations of various primitives.
-
-pub mod sha256;

src/lib.rs

@@ -19,7 +19,6 @@
 
 pub mod arithmetic;
 pub mod circuit;
-pub mod gadget;
 pub mod pasta;
 pub mod plonk;
 pub mod poly;