Merge pull request #225 from isislovecruft/fix/update-rustc-pin

update rustc pin

Author: hdevalence

benches/r1cs.rs

@@ -16,17 +16,17 @@ use merlin::Transcript;
 extern crate rand;
 use rand::Rng;
 
-/* 
+/*
 K-SHUFFLE GADGET SPECIFICATION:
 
 Represents a permutation of a list of `k` scalars `{x_i}` into a list of `k` scalars `{y_i}`.
 
-Algebraically it can be expressed as a statement that for a free variable `z`, 
+Algebraically it can be expressed as a statement that for a free variable `z`,
 the roots of the two polynomials in terms of `z` are the same up to a permutation:
 
     ∏(x_i - z) == ∏(y_i - z)
 
-Prover can commit to blinded scalars `x_i` and `y_i` then receive a random challenge `z`, 
+Prover can commit to blinded scalars `x_i` and `y_i` then receive a random challenge `z`,
 and build a proof that the above relation holds.
 
 K-shuffle requires `2*(K-1)` multipliers.
@@ -226,7 +226,7 @@ fn kshuffle_prove_17(c: &mut Criterion) {
     kshuffle_prove_helper(17, c);
 }
 
-criterion_group!{
+criterion_group! {
     name = kshuffle_prove;
     config = Criterion::default();
     targets =
@@ -290,7 +290,7 @@ fn kshuffle_verify_17(c: &mut Criterion) {
     kshuffle_verify_helper(17, c);
 }
 
-criterion_group!{
+criterion_group! {
     name = kshuffle_verify;
     config = Criterion::default();
     targets =

benches/range_proof.rs

@@ -118,7 +118,7 @@ fn verify_aggregated_rangeproof_n_64(c: &mut Criterion) {
     verify_aggregated_rangeproof_helper(64, c);
 }
 
-criterion_group!{
+criterion_group! {
     name = create_rp;
     config = Criterion::default().sample_size(10);
     targets =
@@ -128,7 +128,7 @@ criterion_group!{
     create_aggregated_rangeproof_n_64,
 }
 
-criterion_group!{
+criterion_group! {
     name = verify_rp;
     config = Criterion::default();
     targets =

rust-toolchain

@@ -1 +1 @@
-nightly-2018-10-01
+nightly-2018-12-04

src/errors.rs

@@ -83,10 +83,7 @@ pub enum MPCError {
     WrongNumProofShares,
     /// This error occurs when one or more parties submit malformed
     /// proof shares.
-    #[fail(
-        display = "Malformed proof shares from parties {:?}",
-        bad_shares
-    )]
+    #[fail(display = "Malformed proof shares from parties {:?}", bad_shares)]
     MalformedProofShares {
         /// A vector with the indexes of the parties whose shares were malformed.
         bad_shares: Vec<usize>,

src/inner_product_proof.rs

@@ -444,35 +444,31 @@ mod tests {
         );
 
         let mut verifier = Transcript::new(b"innerproducttest");
-        assert!(
-            proof
-                .verify(
-                    n,
-                    &mut verifier,
-                    util::exp_iter(y_inv).take(n),
-                    &P,
-                    &Q,
-                    &G,
-                    &H
-                )
-                .is_ok()
-        );
+        assert!(proof
+            .verify(
+                n,
+                &mut verifier,
+                util::exp_iter(y_inv).take(n),
+                &P,
+                &Q,
+                &G,
+                &H
+            )
+            .is_ok());
 
         let proof = InnerProductProof::from_bytes(proof.to_bytes().as_slice()).unwrap();
         let mut verifier = Transcript::new(b"innerproducttest");
-        assert!(
-            proof
-                .verify(
-                    n,
-                    &mut verifier,
-                    util::exp_iter(y_inv).take(n),
-                    &P,
-                    &Q,
-                    &G,
-                    &H
-                )
-                .is_ok()
-        );
+        assert!(proof
+            .verify(
+                n,
+                &mut verifier,
+                util::exp_iter(y_inv).take(n),
+                &P,
+                &Q,
+                &G,
+                &H
+            )
+            .is_ok());
     }
 
     #[test]

src/r1cs/prover.rs

@@ -276,13 +276,14 @@ impl<'a, 'b> ProverCS<'a, 'b> {
         lc.terms
             .iter()
             .map(|(var, coeff)| {
-                coeff * match var {
-                    Variable::MultiplierLeft(i) => self.a_L[*i],
-                    Variable::MultiplierRight(i) => self.a_R[*i],
-                    Variable::MultiplierOutput(i) => self.a_O[*i],
-                    Variable::Committed(i) => self.v[*i],
-                    Variable::One() => Scalar::one(),
-                }
+                coeff
+                    * match var {
+                        Variable::MultiplierLeft(i) => self.a_L[*i],
+                        Variable::MultiplierRight(i) => self.a_R[*i],
+                        Variable::MultiplierOutput(i) => self.a_O[*i],
+                        Variable::Committed(i) => self.v[*i],
+                        Variable::One() => Scalar::one(),
+                    }
             })
             .sum()
     }

src/range_proof/mod.rs

@@ -567,11 +567,9 @@ mod tests {
             // 4. Verify with the same customization label as above
             let mut transcript = Transcript::new(b"AggregatedRangeProofTest");
 
-            assert!(
-                proof
-                    .verify_multiple(&bp_gens, &pc_gens, &mut transcript, &value_commitments, n)
-                    .is_ok()
-            );
+            assert!(proof
+                .verify_multiple(&bp_gens, &pc_gens, &mut transcript, &value_commitments, n)
+                .is_ok());
         }
     }
 

tests/r1cs.rs

@@ -158,17 +158,15 @@ fn kshuffle_helper(k: usize) {
 
     {
         let mut verifier_transcript = Transcript::new(b"ShuffleProofTest");
-        assert!(
-            proof
-                .verify(
-                    &pc_gens,
-                    &bp_gens,
-                    &mut verifier_transcript,
-                    &input_commitments,
-                    &output_commitments
-                )
-                .is_ok()
-        );
+        assert!(proof
+            .verify(
+                &pc_gens,
+                &bp_gens,
+                &mut verifier_transcript,
+                &input_commitments,
+                &output_commitments
+            )
+            .is_ok());
     }
 }