From ce6e59bdb8460edea2032646cbf78054369b6afa Mon Sep 17 00:00:00 2001
From: therealyingtong <yingtong@z.cash>
Date: Fri, 9 Apr 2021 21:01:26 +0800
Subject: [PATCH] Address review comments

---
 src/constants.rs                |  4 ++--
 src/constants/commit_ivk_r.rs   | 34 +++++++++++++++++----------------
 src/constants/nullifier_k.rs    | 34 +++++++++++++++++----------------
 src/constants/value_commit_r.rs | 34 +++++++++++++++++----------------
 4 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/src/constants.rs b/src/constants.rs
index 37feb148..955d3564 100644
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -240,11 +240,11 @@ impl<C: CurveAffine> FixedBase<C> for OrchardFixedBase<C> {
             let z_for_single_y = |y: C::Base, z: u64| {
                 let sum_y_is_square: bool = (y + C::Base::from_u64(z)).sqrt().is_some().into();
                 let sum_neg_y_is_square: bool = (-y + C::Base::from_u64(z)).sqrt().is_some().into();
-                (sum_y_is_square && !sum_neg_y_is_square) as usize
+                sum_y_is_square && !sum_neg_y_is_square
             };
 
             for z in 0..(1000 * (1 << (2 * H))) {
-                if ys.iter().map(|y| z_for_single_y(*y, z)).sum::<usize>() == H {
+                if ys.iter().all(|y| z_for_single_y(*y, z)) {
                     return Some(z);
                 }
             }
diff --git a/src/constants/commit_ivk_r.rs b/src/constants/commit_ivk_r.rs
index 8276c15d..e2ea3cc5 100644
--- a/src/constants/commit_ivk_r.rs
+++ b/src/constants/commit_ivk_r.rs
@@ -3735,21 +3735,23 @@ mod tests {
         }
     }
 
-    // #[test]
-    // fn z() {
-    //     let base = super::generator::<pallas::Affine>();
-    //     match base {
-    //         OrchardFixedBases::CommitIvkR(inner) => inner.test_z(&Z, &U, NUM_WINDOWS),
-    //         _ => unreachable!(),
-    //     }
-    // }
+    #[test]
+    fn z() {
+        let base = super::generator::<pallas::Affine>();
+        match base {
+            OrchardFixedBases::CommitIvkR(inner) => inner.test_z(&Z, &U, NUM_WINDOWS),
+            _ => unreachable!(),
+        }
+    }
 
-    // #[test]
-    // fn z_short() {
-    //     let base = super::generator::<pallas::Affine>();
-    //     match base {
-    //         OrchardFixedBases::CommitIvkR(inner) => inner.test_z(&Z_SHORT, &U_SHORT, NUM_WINDOWS_SHORT),
-    //         _ => unreachable!(),
-    //     }
-    // }
+    #[test]
+    fn z_short() {
+        let base = super::generator::<pallas::Affine>();
+        match base {
+            OrchardFixedBases::CommitIvkR(inner) => {
+                inner.test_z(&Z_SHORT, &U_SHORT, NUM_WINDOWS_SHORT)
+            }
+            _ => unreachable!(),
+        }
+    }
 }
diff --git a/src/constants/nullifier_k.rs b/src/constants/nullifier_k.rs
index 306466ee..3a4ead14 100644
--- a/src/constants/nullifier_k.rs
+++ b/src/constants/nullifier_k.rs
@@ -3733,21 +3733,23 @@ mod tests {
         }
     }
 
-    // #[test]
-    // fn z() {
-    //     let base = super::generator::<pallas::Affine>();
-    //     match base {
-    //         OrchardFixedBases::NullifierK(inner) => inner.test_z(&Z, &U, NUM_WINDOWS),
-    //         _ => unreachable!(),
-    //     }
-    // }
+    #[test]
+    fn z() {
+        let base = super::generator::<pallas::Affine>();
+        match base {
+            OrchardFixedBases::NullifierK(inner) => inner.test_z(&Z, &U, NUM_WINDOWS),
+            _ => unreachable!(),
+        }
+    }
 
-    // #[test]
-    // fn z_short() {
-    //     let base = super::generator::<pallas::Affine>();
-    //     match base {
-    //         OrchardFixedBases::NullifierK(inner) => inner.test_z(&Z_SHORT, &U_SHORT, NUM_WINDOWS_SHORT),
-    //         _ => unreachable!(),
-    //     }
-    // }
+    #[test]
+    fn z_short() {
+        let base = super::generator::<pallas::Affine>();
+        match base {
+            OrchardFixedBases::NullifierK(inner) => {
+                inner.test_z(&Z_SHORT, &U_SHORT, NUM_WINDOWS_SHORT)
+            }
+            _ => unreachable!(),
+        }
+    }
 }
diff --git a/src/constants/value_commit_r.rs b/src/constants/value_commit_r.rs
index 6dc310f0..6b0ca830 100644
--- a/src/constants/value_commit_r.rs
+++ b/src/constants/value_commit_r.rs
@@ -3735,21 +3735,23 @@ mod tests {
         }
     }
 
-    // #[test]
-    // fn z() {
-    //     let base = super::generator::<pallas::Affine>();
-    //     match base {
-    //         OrchardFixedBases::ValueCommitR(inner) => inner.test_z(&Z, &U, NUM_WINDOWS),
-    //         _ => unreachable!(),
-    //     }
-    // }
+    #[test]
+    fn z() {
+        let base = super::generator::<pallas::Affine>();
+        match base {
+            OrchardFixedBases::ValueCommitR(inner) => inner.test_z(&Z, &U, NUM_WINDOWS),
+            _ => unreachable!(),
+        }
+    }
 
-    // #[test]
-    // fn z_short() {
-    //     let base = super::generator::<pallas::Affine>();
-    //     match base {
-    //         OrchardFixedBases::ValueCommitR(inner) => inner.test_z(&Z_SHORT, &U_SHORT, NUM_WINDOWS_SHORT),
-    //         _ => unreachable!(),
-    //     }
-    // }
+    #[test]
+    fn z_short() {
+        let base = super::generator::<pallas::Affine>();
+        match base {
+            OrchardFixedBases::ValueCommitR(inner) => {
+                inner.test_z(&Z_SHORT, &U_SHORT, NUM_WINDOWS_SHORT)
+            }
+            _ => unreachable!(),
+        }
+    }
 }