From 30b845e6b30b3fe83ebbd85286a85794c3305d12 Mon Sep 17 00:00:00 2001 From: Daniel Lubarov Date: Mon, 12 Apr 2021 10:18:16 -0700 Subject: [PATCH] Add generator to circuit --- src/gadgets/split_join.rs | 4 +++- src/hash.rs | 6 ++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gadgets/split_join.rs b/src/gadgets/split_join.rs index 21821706..db9d2aab 100644 --- a/src/gadgets/split_join.rs +++ b/src/gadgets/split_join.rs @@ -18,12 +18,13 @@ impl CircuitBuilder { num_bits: usize, ) -> Vec { let bit_targets = self.add_virtual_advice_targets(num_bits); - split_le_generator::(integer, bit_targets.clone()); + self.add_generator(SplitGenerator { integer, bits: bit_targets.clone() }); bit_targets } } /// Generator for a little-endian split. +#[must_use] pub fn split_le_generator( integer: Target, bits: Vec, @@ -32,6 +33,7 @@ pub fn split_le_generator( } /// Generator for a little-endian split. +#[must_use] pub fn split_le_generator_local_wires( gate: usize, integer_input_index: usize, diff --git a/src/hash.rs b/src/hash.rs index e90cdb0a..4cf30126 100644 --- a/src/hash.rs +++ b/src/hash.rs @@ -1,15 +1,13 @@ //! Concrete instantiation of a hash function. -use std::convert::TryInto; - use rayon::prelude::*; +use crate::circuit_builder::CircuitBuilder; use crate::field::field::Field; use crate::gmimc::gmimc_permute_array; use crate::proof::{Hash, HashTarget}; -use crate::util::reverse_index_bits_in_place; -use crate::circuit_builder::CircuitBuilder; use crate::target::Target; +use crate::util::reverse_index_bits_in_place; pub(crate) const SPONGE_RATE: usize = 8; pub(crate) const SPONGE_CAPACITY: usize = 4;