Update calls in R1CS code.

Author: hdevalence

src/r1cs/prover.rs

@@ -325,7 +325,7 @@ impl<'a, 'b> ProverCS<'a, 'b> {
 
             // Commit the blinding factors for the input wires
             for v_b in &self.v_blinding {
-                builder = builder.commit_witness_bytes(b"v_blinding", v_b.as_bytes());
+                builder = builder.rekey_with_witness_bytes(b"v_blinding", v_b.as_bytes());
             }
 
             use rand::thread_rng;

tests/r1cs.rs

@@ -70,9 +70,10 @@ impl ShuffleProof {
         R1CSError,
     > {
         // Apply a domain separator with the shuffle parameters to the transcript
+        // XXX should this be part of the gadget?
         let k = input.len();
-        transcript.commit_bytes(b"dom-sep", b"ShuffleProof");
-        transcript.commit_bytes(b"k", Scalar::from(k as u64).as_bytes());
+        transcript.append_message(b"dom-sep", b"ShuffleProof");
+        transcript.append_u64(b"k", k as u64);
 
         let mut prover = Prover::new(&bp_gens, &pc_gens, transcript);
 
@@ -111,9 +112,10 @@ impl ShuffleProof {
         output_commitments: &Vec<CompressedRistretto>,
     ) -> Result<(), R1CSError> {
         // Apply a domain separator with the shuffle parameters to the transcript
+        // XXX should this be part of the gadget?
         let k = input_commitments.len();
-        transcript.commit_bytes(b"dom-sep", b"ShuffleProof");
-        transcript.commit_bytes(b"k", Scalar::from(k as u64).as_bytes());
+        transcript.append_message(b"dom-sep", b"ShuffleProof");
+        transcript.append_u64(b"k", k as u64);
 
         let mut verifier = Verifier::new(&bp_gens, &pc_gens, transcript);