arnaucube/Nova
1
0
Fork 0
mirror of https://github.com/arnaucube/Nova.git synced 2026-01-11 16:41:28 +01:00
Code Issues Projects Releases Wiki Activity

remove unused constants (#40)

Browse Source
This commit is contained in:
Srinath Setty
2022-04-25 18:40:09 -07:00
committed by GitHub
parent 751b3434ec
commit 3445d7da61
1 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/poseidon.rs
View File

@@ -7,7 +7,7 @@ use bellperson::{
ConstraintSystem, SynthesisError, ConstraintSystem, SynthesisError,
}; };
use ff::{PrimeField, PrimeFieldBits}; use ff::{PrimeField, PrimeFieldBits};
use generic_array::typenum::{U25, U27, U31, U8}; use generic_array::typenum::{U27, U8};
use neptune::{ use neptune::{
circuit::poseidon_hash, circuit::poseidon_hash,
poseidon::{Poseidon, PoseidonConstants}, poseidon::{Poseidon, PoseidonConstants},
@@ -23,9 +23,7 @@ where
F: PrimeField, F: PrimeField,
{ {
constants8: PoseidonConstants<F, U8>, constants8: PoseidonConstants<F, U8>,
constants25: PoseidonConstants<F, U25>,
constants27: PoseidonConstants<F, U27>, constants27: PoseidonConstants<F, U27>,
constants31: PoseidonConstants<F, U31>,
} }
#[cfg(test)] #[cfg(test)]
@@ -37,14 +35,10 @@ where
#[allow(clippy::new_without_default)] #[allow(clippy::new_without_default)]
pub fn new() -> Self { pub fn new() -> Self {
let constants8 = PoseidonConstants::<F, U8>::new_with_strength(Strength::Strengthened); let constants8 = PoseidonConstants::<F, U8>::new_with_strength(Strength::Strengthened);
let constants25 = PoseidonConstants::<F, U25>::new_with_strength(Strength::Strengthened);
let constants27 = PoseidonConstants::<F, U27>::new_with_strength(Strength::Strengthened); let constants27 = PoseidonConstants::<F, U27>::new_with_strength(Strength::Strengthened);
let constants31 = PoseidonConstants::<F, U31>::new_with_strength(Strength::Strengthened);
Self { Self {
constants8, constants8,
constants25,
constants27, constants27,
constants31,
} }
} }
} }
@@ -83,17 +77,14 @@ where
8 => { 8 => {
Poseidon::<Scalar, U8>::new_with_preimage(&self.state, &self.constants.constants8).hash() Poseidon::<Scalar, U8>::new_with_preimage(&self.state, &self.constants.constants8).hash()
} }
25 => {
Poseidon::<Scalar, U25>::new_with_preimage(&self.state, &self.constants.constants25).hash()
}
27 => { 27 => {
Poseidon::<Scalar, U27>::new_with_preimage(&self.state, &self.constants.constants27).hash() Poseidon::<Scalar, U27>::new_with_preimage(&self.state, &self.constants.constants27).hash()
} }
31 => {
Poseidon::<Scalar, U31>::new_with_preimage(&self.state, &self.constants.constants31).hash()
}
_ => { _ => {
panic!("Number of elements in the RO state does not match any of the arities used in Nova") panic!(
"Number of elements in the RO state does not match any of the arities used in Nova: {:?}",
self.state.len()
);
} }
} }
} }
@@ -171,24 +162,14 @@ where
self.state.clone(), self.state.clone(),
&self.constants.constants8, &self.constants.constants8,
)?, )?,
25 => poseidon_hash(
cs.namespace(|| "Poseidon hash"),
self.state.clone(),
&self.constants.constants25,
)?,
27 => poseidon_hash( 27 => poseidon_hash(
cs.namespace(|| "Poseidon hash"), cs.namespace(|| "Poseidon hash"),
self.state.clone(), self.state.clone(),
&self.constants.constants27, &self.constants.constants27,
)?, )?,
31 => poseidon_hash(
cs.namespace(|| "Poseidon hash"),
self.state.clone(),
&self.constants.constants31,
)?,
_ => { _ => {
panic!( panic!(
"Number of elements in the RO state does not match any of the arities used in Nova {}", "Number of elements in the RO state does not match any of the arities used in Nova: {}",
self.state.len() self.state.len()
) )
} }
@@ -246,7 +227,7 @@ mod tests {
let mut ro: PoseidonRO<S> = PoseidonRO::new(constants.clone()); let mut ro: PoseidonRO<S> = PoseidonRO::new(constants.clone());
let mut ro_gadget: PoseidonROGadget<S> = PoseidonROGadget::new(constants); let mut ro_gadget: PoseidonROGadget<S> = PoseidonROGadget::new(constants);
let mut cs: SatisfyingAssignment<G> = SatisfyingAssignment::new(); let mut cs: SatisfyingAssignment<G> = SatisfyingAssignment::new();
for i in 0..31 { for i in 0..27 {
let num = S::random(&mut csprng); let num = S::random(&mut csprng);
ro.absorb(num); ro.absorb(num);
let num_gadget = let num_gadget =