Fix non_interactive_protocol.rs test (Rest: correctness)

Author: nougzarm

src/toolbox/sigma/fiat_shamir.rs

@@ -7,7 +7,7 @@ use group::Group;
 pub struct NISigmaProtocol<P, C, G>
 where
     G: Group,
-    P: SigmaProtocol<Commitment = G, Challenge = <G as Group>::Scalar>,
+    P: SigmaProtocol<Commitment = Vec<G>, Challenge = <G as Group>::Scalar>,
     C: TranscriptCodec<G>,
 {
     domain_sep: Vec<u8>,
@@ -19,7 +19,7 @@ where
 impl<P, C, G> NISigmaProtocol<P, C, G>
 where
     G: Group,
-    P: SigmaProtocol<Commitment = G, Challenge = <G as Group>::Scalar>,
+    P: SigmaProtocol<Commitment = Vec<G>, Challenge = <G as Group>::Scalar>,
     C: TranscriptCodec<G>,
 {
     // Create new NIZK transformator.
@@ -41,8 +41,9 @@ where
         // Fiat Shamir challenge
         let challenge = self
             .hash_state
-            .prover_message(&[commitment])
+            .prover_message(&commitment)
             .verifier_challenge();
+        println!("Prover's challenge : {:?}", challenge);
         // Prouver's response
         let response = self.sigmap.prover_response(&prover_state, &challenge);
         // Local verification of the proof
@@ -58,8 +59,9 @@ where
         // Recompute the challenge
         let challenge = self
             .hash_state
-            .prover_message(&[commitment])
+            .prover_message(&commitment)
             .verifier_challenge();
+        println!("Verifier's challenge : {:?}", challenge);
         // Verification of the proof
         self.sigmap.verifier(&commitment, &challenge, &response)
 

src/toolbox/sigma/schnorr_proof.rs

@@ -73,7 +73,7 @@ where
     ) -> Vec<u8> {
         let mut bytes = Vec::new();
         let scalar_nb = self.morphismp.morphism.num_scalars.clone();
-        // Serialize commitmens
+        // Serialize commitments
         for i in 0..scalar_nb {
             bytes.extend_from_slice(commitment[i].to_bytes().as_ref());
         }

tests/non_interactive_protocol.rs

@@ -21,13 +21,17 @@ fn fiat_shamir_schnorr_proof_ristretto() {
     let w = Scalar::random(&mut rng);
     let H = G * w;
 
-    let morphismp: GroupMorphismPreimage<RistrettoPoint> = GroupMorphismPreimage::new();
+    let mut morphismp: GroupMorphismPreimage<RistrettoPoint> = GroupMorphismPreimage::new();
 
     // Scalars and Points bases settings
     morphismp.allocate_scalars(1);
     morphismp.allocate_elements(1);
     morphismp.set_elements(&[(0, G)]);
 
+    // Set the witness Vec
+    let mut witness = Vec::new();
+    witness.push(w.clone());
+
     // The H = z * G equeation where z is the unique scalar variable
     morphismp.append_equation(H, &[(0, 0)]);
 
@@ -38,7 +42,7 @@ fn fiat_shamir_schnorr_proof_ristretto() {
     let mut nizk = NISigmaProtocol::<SchnorrProof<G>, KeccakTranscript<G>, G>::new(domain_sep, protocol);
 
     // Prove
-    let proof_bytes = nizk.prove(&w, &mut rng);
+    let proof_bytes = nizk.prove(&witness, &mut rng);
 
     // Verify
     let verified = nizk.verify(&proof_bytes);