Make it possible to build with the "circuit" feature for no_std.

Signed-off-by: Daira-Emma Hopwood <[email protected]>

Author: daira

.github/workflows/ci.yml

@@ -63,7 +63,7 @@ jobs:
           echo "#![no_std]" > ./ci-build/src/lib.rs
       - name: Add dependencies of the synthetic crate (e.g. sapling-crypto)
         working-directory: ./ci-build
-        run: cargo add --no-default-features --path ../crate_root
+        run: cargo add --no-default-features --features "circuit" --path ../crate_root
       - name: Add lazy_static with the spin_no_std feature
         working-directory: ./ci-build
         run: cargo add lazy_static --no-default-features --features "spin_no_std"

.github/workflows/lints-stable.yml

@@ -43,7 +43,7 @@ jobs:
           echo "#![no_std]" > ./ci-build/src/lib.rs
       - name: Add dependencies of the synthetic crate (e.g. sapling-crypto)
         working-directory: ./ci-build
-        run: cargo add --no-default-features --path ../crate_root
+        run: cargo add --no-default-features --features "circuit" --path ../crate_root
       - name: Add lazy_static with the spin_no_std feature
         working-directory: ./ci-build
         run: cargo add lazy_static --no-default-features --features "spin_no_std"

Cargo.toml

@@ -83,7 +83,7 @@ bench = false
 [features]
 default = ["circuit", "multicore", "std"]
 std = ["core2/std", "group/wnaf-memuse", "reddsa/std"]
-circuit = ["dep:halo2_gadgets", "dep:halo2_proofs", "std"]
+circuit = ["dep:halo2_gadgets", "dep:halo2_proofs"]
 unstable-frost = []
 multicore = ["halo2_proofs?/multicore"]
 dev-graph = ["halo2_proofs?/dev-graph", "image", "plotters"]

src/bundle.rs

@@ -4,9 +4,9 @@ use alloc::vec::Vec;
 
 pub mod commitments;
 
-#[cfg(feature = "circuit")]
+#[cfg(all(feature = "circuit", feature = "std"))]
 mod batch;
-#[cfg(feature = "circuit")]
+#[cfg(all(feature = "circuit", feature = "std"))]
 pub use batch::BatchValidator;
 
 use core::fmt;