From 52829af6d829a79414223d3787cdd46998a283b5 Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Sun, 11 Feb 2018 12:38:17 -0700 Subject: [PATCH 1/2] Fix test for pedersen hash chunks per generator. --- src/jubjub/tests.rs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/jubjub/tests.rs b/src/jubjub/tests.rs index 6de950ba3..e034854d3 100644 --- a/src/jubjub/tests.rs +++ b/src/jubjub/tests.rs @@ -356,10 +356,16 @@ fn test_jubjub_params(params: &E::Params) { // Check that the number of windows per generator // 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 nacc = E::Fr::char(); + let mut max = E::Fs::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() { @@ -371,7 +377,7 @@ fn test_jubjub_params(params: &E::Params) { assert_eq!(pacc.add_nocarry(&tmp), false); assert_eq!(nacc.sub_noborrow(&tmp), false); - assert!(pacc < E::Fr::char()); + assert!(pacc < max); assert!(pacc < nacc); // cur = cur * 16 From 821d22261eb8cca81d19b7475f1dcb971609909a Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Sun, 11 Feb 2018 12:59:57 -0700 Subject: [PATCH 2/2] Raise the number of chunks in Pedersen hashes to 63. --- src/jubjub/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jubjub/mod.rs b/src/jubjub/mod.rs index c265d8499..bd259ff7c 100644 --- a/src/jubjub/mod.rs +++ b/src/jubjub/mod.rs @@ -93,7 +93,7 @@ impl JubjubParams for JubjubBls12 { &self.pedersen_hash_generators } fn pedersen_hash_chunks_per_generator(&self) -> usize { - 62 + 63 } fn fixed_base_chunks_per_generator(&self) -> usize { 84