M Cargo.toml → Cargo.toml

@@ -15,7 +15,7 @@ ark-ec = { version = "0.3.0", default-features = false }
 ark-ff = { version = "0.3.0", default-features = false }
 ark-std = { version = "0.3.0", default-features = false }
 ark-bn254 = { version = "0.3.0" }
-ark-groth16 = { git = "https://github.com/gakonst/groth16", version = "0.3.0", branch = "feat/customizable-r1cs-to-qap" }
+ark-groth16 = { git = "https://github.com/arkworks-rs/groth16", version = "0.3.0" }
 ark-poly = { version = "^0.3.0", default-features = false }
 ark-relations = { version = "0.3.0", default-features = false }
 ark-serialize = { version = "0.3.0", default-features = false }

M src/circom/qap.rs → src/circom/qap.rs

@@ -49,8 +49,8 @@ .zip(cfg_iter_mut!(b[..num_constraints]))
             .zip(cfg_iter!(&matrices.a))
             .zip(cfg_iter!(&matrices.b))
             .for_each(|(((a, b), at_i), bt_i)| {
-                *a = evaluate_constraint(&at_i, &full_assignment);
-                *b = evaluate_constraint(&bt_i, &full_assignment);
+                *a = evaluate_constraint(at_i, &full_assignment);
+                *b = evaluate_constraint(bt_i, &full_assignment);
             });
 
         {

M src/witness/witness_calculator.rs → src/witness/witness_calculator.rs

@@ -115,19 +115,19 @@ pub fn error(store: &Store) -> Function {
         #[allow(unused)]
         #[allow(clippy::many_single_char_names)]
         fn func(a: i32, b: i32, c: i32, d: i32, e: i32, f: i32) {}
-        Function::new_native(&store, func)
+        Function::new_native(store, func)
     }
 
     pub fn log_signal(store: &Store) -> Function {
         #[allow(unused)]
         fn func(a: i32, b: i32) {}
-        Function::new_native(&store, func)
+        Function::new_native(store, func)
     }
 
     pub fn log_component(store: &Store) -> Function {
         #[allow(unused)]
         fn func(a: i32) {}
-        Function::new_native(&store, func)
+        Function::new_native(store, func)
     }
 }
 

M src/zkey.rs → src/zkey.rs

@@ -35,7 +35,7 @@ collections::HashMap,
     io::{Read, Result as IoResult, Seek, SeekFrom},
 };
 
-use ark_bn254::{Bn254, Fq, Fq2, Fr, G1Affine, G2Affine};
+use ark_bn254::{Bn254, Fq, Fq2, G1Affine, G2Affine};
 use ark_groth16::{ProvingKey, VerifyingKey};
 use num_traits::Zero;