Finished changing variables name.

Author: damrobi

mithril-stm/src/schnorr_signature/mod.rs

@@ -79,6 +79,18 @@ mod tests {
         assert_eq!(jjscalar, converted_base);
     }
 
+    #[test]
+    fn test_generate_signing_key() {
+        let mut rng = ChaCha20Rng::from_seed([0u8; 32]);
+        let sk = SchnorrSigningKey::generate(&mut rng);
+        let g = JubjubSubgroup::generator();
+        let vk = g * sk.0;
+
+        let vk_from_sk = SchnorrVerificationKey::from(&sk);
+
+        assert_eq!(vk, vk_from_sk.0);
+    }
+
     #[test]
     fn test_sig_and_verify() {
         let msg = vec![0, 0, 0, 1];

mithril-stm/src/schnorr_signature/signature.rs

@@ -66,22 +66,22 @@ impl SchnorrSignature {
 
         // Computing R1 = H(msg) * s + sigma * c
         let challenge_scalar = jubjub_base_to_scalar(&self.challenge)?;
-        let h_s = hash_msg * self.signature;
-        let sigma_c = self.sigma * challenge_scalar;
-        let r1_tilde = h_s + sigma_c;
+        let hash_msg_times_sig = hash_msg * self.signature;
+        let sigma_times_challenge = self.sigma * challenge_scalar;
+        let random_value_1_recomputed = hash_msg_times_sig + sigma_times_challenge;
 
         // Computing R2 = g * s + vk * c
-        let g_s = generator * self.signature;
-        let vk_c = vk.0 * challenge_scalar;
-        let r2_tilde = g_s + vk_c;
+        let generator_times_s = generator * self.signature;
+        let vk_times_challenge = vk.0 * challenge_scalar;
+        let random_value_2_recomputed = generator_times_s + vk_times_challenge;
 
         let (hashx, hashy) = get_coordinates(hash_msg);
         let (vkx, vky) = get_coordinates(vk.0);
         let (sigmax, sigmay) = get_coordinates(self.sigma);
-        let (r1x, r1y) = get_coordinates(r1_tilde);
-        let (r2x, r2y) = get_coordinates(r2_tilde);
+        let (r1x, r1y) = get_coordinates(random_value_1_recomputed);
+        let (r2x, r2y) = get_coordinates(random_value_2_recomputed);
 
-        let c_tilde = PoseidonChip::<JubjubBase>::hash(&[
+        let challenge_recomputed = PoseidonChip::<JubjubBase>::hash(&[
             DST_SIGNATURE,
             hashx,
             hashy,
@@ -95,7 +95,7 @@ impl SchnorrSignature {
             r2y,
         ]);
 
-        if c_tilde != self.challenge {
+        if challenge_recomputed != self.challenge {
             // TODO: Wrong error for now, need to change that once the errors are added
             return Err(anyhow!("Signature failed to verify."));
         }

mithril-stm/src/schnorr_signature/verification_key.rs

@@ -10,18 +10,10 @@ pub(crate) use crate::schnorr_signature::signing_key::SchnorrSigningKey;
 pub struct SchnorrVerificationKey(pub(crate) JubjubSubgroup);
 
 impl SchnorrVerificationKey {
-    /// TODO: Make sure this is correct as the previous implementation is
-    /// using coordinates decomposition
     pub(crate) fn to_bytes(self) -> [u8; 32] {
-        // let (x, y) = get_coordinates(self.0);
-        // let mut bytes = [0u8; 64];
-        // bytes[0..32].copy_from_slice(&x.to_bytes_le());
-        // bytes[32..64].copy_from_slice(&y.to_bytes_le());
-        // bytes
         self.0.to_bytes()
     }
 
-    /// Do we really need to separate the coordinates?
     pub(crate) fn from_bytes(bytes: &[u8]) -> Result<Self> {
         let bytes = bytes
             .get(0..32)
@@ -37,6 +29,7 @@ impl SchnorrVerificationKey {
 
 impl From<&SchnorrSigningKey> for SchnorrVerificationKey {
     /// Convert a Shnorr secret key into a verification key
+    ///
     /// This is done by computing `vk = g * sk` where g is the generator
     /// of the subgroup and sk is the schnorr secret key
     fn from(sk: &SchnorrSigningKey) -> Self {
@@ -45,17 +38,3 @@ impl From<&SchnorrSigningKey> for SchnorrVerificationKey {
         SchnorrVerificationKey(g * sk.0)
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use rand_chacha::ChaCha20Rng;
-    use rand_core::SeedableRng;
-
-    #[test]
-    fn test_generate_signing_key() {
-        let mut rng = ChaCha20Rng::from_seed([0u8; 32]);
-        let sk = SchnorrSigningKey::generate(&mut rng);
-        let _vk = SchnorrVerificationKey::from(&sk);
-    }
-}