refactor imports, add voter proof module

Author: Mr-Leshiy

rust/catalyst-voting/src/crypto/zk_unit_vector/mod.rs

@@ -4,8 +4,6 @@
 //!
 //! This implementation follows this [specification](https://input-output-hk.github.io/catalyst-voices/architecture/08_concepts/voting_transaction/crypto/#d-non-interactive-zk-vote-proof)
 
-#![allow(dead_code)]
-
 mod challenges;
 mod polynomial;
 mod randomness_announcements;
@@ -42,8 +40,8 @@ pub struct UnitVectorProof(
 /// Pls make sure that you are providing a correct arguments, otherwise
 /// the proof will be invalid.
 pub fn generate_unit_vector_proof<R: CryptoRngCore>(
-    unit_vector: &[Scalar], mut encryption_randomness: Vec<Scalar>,
-    mut ciphertexts: Vec<Ciphertext>, public_key: &PublicKey, commitment_key: &GroupElement,
+    unit_vector: &[Scalar], mut ciphertexts: Vec<Ciphertext>,
+    mut encryption_randomness: Vec<Scalar>, public_key: &PublicKey, commitment_key: &GroupElement,
     rng: &mut R,
 ) -> UnitVectorProof {
     let i = unit_vector
@@ -238,8 +236,6 @@ mod tests {
 
     use super::{super::elgamal::SecretKey, *};
 
-    const VECTOR_SIZE: usize = 3;
-
     fn is_unit_vector(vector: &[Scalar]) -> bool {
         let ones = vector.iter().filter(|s| s == &&Scalar::one()).count();
         let zeros = vector.iter().filter(|s| s == &&Scalar::zero()).count();
@@ -282,8 +278,8 @@ mod tests {
 
         let proof = generate_unit_vector_proof(
             &unit_vector,
-            encryption_randomness,
             ciphertexts.clone(),
+            encryption_randomness,
             &public_key,
             &commitment_key,
             &mut rng,
@@ -326,8 +322,8 @@ mod tests {
 
         let proof = generate_unit_vector_proof(
             &random_vector,
-            encryption_randomness,
             ciphertexts.clone(),
+            encryption_randomness,
             &public_key,
             &commitment_key,
             &mut rng,

rust/catalyst-voting/src/lib.rs

@@ -83,9 +83,7 @@
 //! ```
 
 mod crypto;
-mod tally;
-mod voter;
+pub mod tally;
+pub mod voter;
 
 pub use crypto::elgamal::{PublicKey, SecretKey};
-pub use tally::{proof::*, *};
-pub use voter::*;

rust/catalyst-voting/src/voter/mod.rs

@@ -1,5 +1,7 @@
 //! Module containing all primitives related to the voter.
 
+pub mod proof;
+
 use rand_core::CryptoRngCore;
 
 use crate::crypto::{

rust/catalyst-voting/src/voter/proof.rs

@@ -0,0 +1,45 @@
+//! Voter proof generation and verification procedures.
+//! It allows to transparently verify the correctness voter generation and encryption.
+
+use rand_core::CryptoRngCore;
+
+use super::{EncryptedVote, EncryptionRandomness, Vote};
+use crate::{
+    crypto::zk_unit_vector::{
+        generate_unit_vector_proof, verify_unit_vector_proof, UnitVectorProof,
+    },
+    PublicKey,
+};
+
+/// Tally proof struct.
+#[allow(clippy::module_name_repetitions)]
+pub struct VoterProof(UnitVectorProof);
+
+/// Generates a voter proof.
+/// More detailed described [here](https://input-output-hk.github.io/catalyst-voices/architecture/08_concepts/voting_transaction/crypto/#voters-proof)
+#[allow(clippy::module_name_repetitions)]
+pub fn generate_voter_proof<R: CryptoRngCore>(
+    vote: &Vote, encrypted_vote: EncryptedVote, randomness: EncryptionRandomness,
+    public_key: &PublicKey, commitment_key: &PublicKey, rng: &mut R,
+) -> VoterProof {
+    let proof = generate_unit_vector_proof(
+        &vote.to_unit_vector(),
+        encrypted_vote.0,
+        randomness.0,
+        public_key,
+        commitment_key,
+        rng,
+    );
+    VoterProof(proof)
+}
+
+/// Verifies a voter proof.
+/// More detailed described [here](https://input-output-hk.github.io/catalyst-voices/architecture/08_concepts/voting_transaction/crypto/#voters-proof)
+#[must_use]
+#[allow(clippy::module_name_repetitions)]
+pub fn verify_voter_proof(
+    encrypted_vote: EncryptedVote, public_key: &PublicKey, commitment_key: &PublicKey,
+    proof: &VoterProof,
+) -> bool {
+    verify_unit_vector_proof(&proof.0, encrypted_vote.0, public_key, commitment_key)
+}

rust/catalyst-voting/tests/voting_test.rs

@@ -1,8 +1,13 @@
 //! A general voting integration test, which performs a full voting procedure.
 
 use catalyst_voting::{
-    decrypt_tally, encrypt_vote, generate_tally_proof, tally, verify_tally_proof,
-    DecryptionTallySetup, SecretKey, Vote,
+    tally::{
+        decrypt_tally,
+        proof::{generate_tally_proof, verify_tally_proof},
+        tally, DecryptionTallySetup,
+    },
+    voter::{encrypt_vote, Vote},
+    SecretKey,
 };
 use proptest::prelude::ProptestConfig;
 use test_strategy::{proptest, Arbitrary};