Merge pull request #29 from ebfull/pedersen-chunks
63 chunks per pedersen hash segment
This commit is contained in:
commit
8d633db82b
|
@ -93,7 +93,7 @@ impl JubjubParams<Bls12> for JubjubBls12 {
|
||||||
&self.pedersen_hash_generators
|
&self.pedersen_hash_generators
|
||||||
}
|
}
|
||||||
fn pedersen_hash_chunks_per_generator(&self) -> usize {
|
fn pedersen_hash_chunks_per_generator(&self) -> usize {
|
||||||
62
|
63
|
||||||
}
|
}
|
||||||
fn fixed_base_chunks_per_generator(&self) -> usize {
|
fn fixed_base_chunks_per_generator(&self) -> usize {
|
||||||
84
|
84
|
||||||
|
|
|
@ -356,10 +356,16 @@ fn test_jubjub_params<E: JubjubEngine>(params: &E::Params) {
|
||||||
// Check that the number of windows per generator
|
// Check that the number of windows per generator
|
||||||
// in the Pedersen hash does not allow for collisions
|
// in the Pedersen hash does not allow for collisions
|
||||||
|
|
||||||
let mut cur = E::Fr::one().into_repr();
|
let mut cur = E::Fs::one().into_repr();
|
||||||
|
|
||||||
let mut pacc = E::Fr::zero().into_repr();
|
let mut max = E::Fs::char();
|
||||||
let mut nacc = E::Fr::char();
|
{
|
||||||
|
max.sub_noborrow(&E::Fs::one().into_repr());
|
||||||
|
max.div2();
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut pacc = E::Fs::zero().into_repr();
|
||||||
|
let mut nacc = E::Fs::char();
|
||||||
|
|
||||||
for _ in 0..params.pedersen_hash_chunks_per_generator()
|
for _ in 0..params.pedersen_hash_chunks_per_generator()
|
||||||
{
|
{
|
||||||
|
@ -371,7 +377,7 @@ fn test_jubjub_params<E: JubjubEngine>(params: &E::Params) {
|
||||||
assert_eq!(pacc.add_nocarry(&tmp), false);
|
assert_eq!(pacc.add_nocarry(&tmp), false);
|
||||||
assert_eq!(nacc.sub_noborrow(&tmp), false);
|
assert_eq!(nacc.sub_noborrow(&tmp), false);
|
||||||
|
|
||||||
assert!(pacc < E::Fr::char());
|
assert!(pacc < max);
|
||||||
assert!(pacc < nacc);
|
assert!(pacc < nacc);
|
||||||
|
|
||||||
// cur = cur * 16
|
// cur = cur * 16
|
||||||
|
|
Loading…
Reference in New Issue