From f316f6a9fadecb75267ebc19e991287a63e7e155 Mon Sep 17 00:00:00 2001
From: Georgios Konstantopoulos <me@gakonst.com>
Date: Fri, 13 Aug 2021 12:37:09 +0300
Subject: [PATCH] chore: use latest upstream gro16

---
 Cargo.toml                        | 2 +-
 src/circom/qap.rs                 | 4 ++--
 src/witness/witness_calculator.rs | 6 +++---
 src/zkey.rs                       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2381b62..70a2020 100644
--- a/Cargo.toml
+++ b/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 }
diff --git a/src/circom/qap.rs b/src/circom/qap.rs
index 0a94a89..70cbdd9 100644
--- a/src/circom/qap.rs
+++ b/src/circom/qap.rs
@@ -49,8 +49,8 @@ impl R1CStoQAP for CircomReduction {
             .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);
             });
 
         {
diff --git a/src/witness/witness_calculator.rs b/src/witness/witness_calculator.rs
index 2c193b8..891454d 100644
--- a/src/witness/witness_calculator.rs
+++ b/src/witness/witness_calculator.rs
@@ -115,19 +115,19 @@ mod runtime {
         #[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)
     }
 }
 
diff --git a/src/zkey.rs b/src/zkey.rs
index 038a189..0f839bc 100644
--- a/src/zkey.rs
+++ b/src/zkey.rs
@@ -35,7 +35,7 @@ use std::{
     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;