clippy fixes (#50)

* clippy fixes

* remove warning

* fix clippy

Author: srinathsetty

benches/nizk.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::assertions_on_result_states)]
 extern crate byteorder;
 extern crate core;
 extern crate criterion;

benches/snark.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::assertions_on_result_states)]
 extern crate libspartan;
 extern crate merlin;
 

examples/cubic.rs

@@ -8,6 +8,7 @@
 //! `(Z3 + 5) * 1 - I0 = 0`
 //!
 //! [here]: https://medium.com/@VitalikButerin/quadratic-arithmetic-programs-from-zero-to-hero-f6d558cea649
+#![allow(clippy::assertions_on_result_states)]
 use curve25519_dalek::scalar::Scalar;
 use libspartan::{InputsAssignment, Instance, SNARKGens, VarsAssignment, SNARK};
 use merlin::Transcript;

profiler/nizk.rs

@@ -1,4 +1,6 @@
 #![allow(non_snake_case)]
+#![allow(clippy::assertions_on_result_states)]
+
 extern crate flate2;
 extern crate libspartan;
 extern crate merlin;

profiler/snark.rs

@@ -1,4 +1,6 @@
 #![allow(non_snake_case)]
+#![allow(clippy::assertions_on_result_states)]
+
 extern crate flate2;
 extern crate libspartan;
 extern crate merlin;

rustfmt.toml

@@ -1,5 +1,4 @@
 edition = "2018"
 tab_spaces = 2
 newline_style = "Unix"
-report_fixme = "Always"
 use_try_shorthand = true

src/lib.rs

@@ -3,6 +3,7 @@
 #![feature(int_log)]
 #![doc = include_str!("../README.md")]
 #![deny(missing_docs)]
+#![allow(clippy::assertions_on_result_states)]
 
 extern crate byteorder;
 extern crate core;

src/r1csinstance.rs

@@ -230,7 +230,7 @@ impl R1CSInstance {
       C: poly_C,
     };
 
-    assert!(inst.is_sat(&Z[..num_vars].to_vec(), &Z[num_vars + 1..].to_vec()));
+    assert!(inst.is_sat(&Z[..num_vars], &Z[num_vars + 1..]));
 
     (inst, Z[..num_vars].to_vec(), Z[num_vars + 1..].to_vec())
   }

src/r1csproof.rs

@@ -294,12 +294,12 @@ impl R1CSProof {
     timer_sc_proof_phase2.stop();
 
     let timer_polyeval = Timer::new("polyeval");
-    let eval_vars_at_ry = poly_vars.evaluate(&ry[1..].to_vec());
+    let eval_vars_at_ry = poly_vars.evaluate(&ry[1..]);
     let blind_eval = random_tape.random_scalar(b"blind_eval");
     let (proof_eval_vars_at_ry, comm_vars_at_ry) = PolyEvalProof::prove(
       &poly_vars,
       Some(&blinds_vars),
-      &ry[1..].to_vec(),
+      &ry[1..],
       &eval_vars_at_ry,
       Some(&blind_eval),
       &gens.gens_pc,
@@ -447,7 +447,7 @@ impl R1CSProof {
     self.proof_eval_vars_at_ry.verify(
       &gens.gens_pc,
       transcript,
-      &ry[1..].to_vec(),
+      &ry[1..],
       &self.comm_vars_at_ry,
       &self.comm_vars,
     )?;
@@ -461,8 +461,7 @@ impl R1CSProof {
           .map(|i| SparsePolyEntry::new(i + 1, input[i]))
           .collect::<Vec<SparsePolyEntry>>(),
       );
-      SparsePolynomial::new(n.log2() as usize, input_as_sparse_poly_entries)
-        .evaluate(&ry[1..].to_vec())
+      SparsePolynomial::new(n.log2() as usize, input_as_sparse_poly_entries).evaluate(&ry[1..])
     };
 
     // compute commitment to eval_Z_at_ry = (Scalar::one() - ry[0]) * self.eval_vars_at_ry + ry[0] * poly_input_eval

src/sparse_mlpoly.rs

@@ -966,16 +966,13 @@ impl HashLayerProof {
     let mut r_joint_ops = challenges_ops;
     r_joint_ops.extend(rand_ops);
     joint_claim_eval_ops.append_to_transcript(b"joint_claim_eval_ops", transcript);
-    assert!(self
-      .proof_ops
-      .verify_plain(
-        &gens.gens_ops,
-        transcript,
-        &r_joint_ops,
-        &joint_claim_eval_ops,
-        &comm.comm_comb_ops
-      )
-      .is_ok());
+    self.proof_ops.verify_plain(
+      &gens.gens_ops,
+      transcript,
+      &r_joint_ops,
+      &joint_claim_eval_ops,
+      &comm.comm_comb_ops,
+    )?;
 
     // verify proof-mem using comm_comb_mem at rand_mem
     // form a single decommitment using comb_comb_mem at rand_mem
@@ -1406,33 +1403,30 @@ impl PolyEvalNetworkProof {
     let (claims_ops_col_read, claims_ops_col_write) = claims_ops_col.split_at_mut(num_instances);
 
     // verify the proof of hash layer
-    assert!(self
-      .proof_hash_layer
-      .verify(
-        (&rand_mem, &rand_ops),
-        &(
-          claims_mem[0],
-          claims_ops_row_read.to_vec(),
-          claims_ops_row_write.to_vec(),
-          claims_mem[1],
-        ),
-        &(
-          claims_mem[2],
-          claims_ops_col_read.to_vec(),
-          claims_ops_col_write.to_vec(),
-          claims_mem[3],
-        ),
-        &claims_dotp,
-        comm,
-        gens,
-        comm_derefs,
-        rx,
-        ry,
-        r_hash,
-        r_multiset_check,
-        transcript
-      )
-      .is_ok());
+    self.proof_hash_layer.verify(
+      (&rand_mem, &rand_ops),
+      &(
+        claims_mem[0],
+        claims_ops_row_read.to_vec(),
+        claims_ops_row_write.to_vec(),
+        claims_mem[1],
+      ),
+      &(
+        claims_mem[2],
+        claims_ops_col_read.to_vec(),
+        claims_ops_col_write.to_vec(),
+        claims_mem[3],
+      ),
+      &claims_dotp,
+      comm,
+      gens,
+      comm_derefs,
+      rx,
+      ry,
+      r_hash,
+      r_multiset_check,
+      transcript,
+    )?;
     timer.stop();
 
     Ok(())