From 3fded1fbccf7c5491930dd8340c9b4567355d509 Mon Sep 17 00:00:00 2001
From: Chris Sosnin <48099298+slumber@users.noreply.github.com>
Date: Sat, 19 Aug 2023 23:13:13 +0300
Subject: [PATCH] patch dependencies and fix imports (#167)

Co-authored-by: Pratyush Mishra <pratyushmishra@berkeley.edu>
---
 Cargo.toml                                       | 2 +-
 bls12_381/src/fields/tests.rs                    | 3 +--
 ed_on_bls12_381/src/fields/tests.rs              | 3 +--
 ed_on_bls12_381_bandersnatch/src/fields/tests.rs | 3 +--
 ed_on_bn254/src/fields/tests.rs                  | 3 +--
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 380b904..5981ae4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -72,4 +72,4 @@ ark-poly = { git = "https://github.com/arkworks-rs/algebra/" }
 ark-serialize = { git = "https://github.com/arkworks-rs/algebra/" }
 ark-algebra-test-templates = { git = "https://github.com/arkworks-rs/algebra/" }
 ark-algebra-bench-templates = { git = "https://github.com/arkworks-rs/algebra/" }
-ark-r1cs-std = { git = "https://github.com/mmaker/ark-r1cs-std/", branch = "feature/additive-groups" }
+ark-r1cs-std = { git = "https://github.com/arkworks-rs/r1cs-std/" }
diff --git a/bls12_381/src/fields/tests.rs b/bls12_381/src/fields/tests.rs
index ab3f77f..00fde41 100644
--- a/bls12_381/src/fields/tests.rs
+++ b/bls12_381/src/fields/tests.rs
@@ -1,9 +1,8 @@
 use ark_algebra_test_templates::*;
-use ark_ec::AdditiveGroup;
 use ark_ff::{
     biginteger::{BigInt, BigInteger, BigInteger384},
     fields::{FftField, Field, Fp12Config, Fp2Config, Fp6Config, PrimeField},
-    One, UniformRand, Zero,
+    AdditiveGroup, One, UniformRand, Zero,
 };
 use ark_std::{
     cmp::Ordering,
diff --git a/ed_on_bls12_381/src/fields/tests.rs b/ed_on_bls12_381/src/fields/tests.rs
index 4b4b524..0acb888 100644
--- a/ed_on_bls12_381/src/fields/tests.rs
+++ b/ed_on_bls12_381/src/fields/tests.rs
@@ -1,10 +1,9 @@
 use crate::{Fq, Fr};
 use ark_algebra_test_templates::*;
-use ark_ec::AdditiveGroup;
 use ark_ff::{
     biginteger::BigInteger256 as BigInteger,
     fields::{Field, LegendreSymbol::*},
-    One, Zero,
+    AdditiveGroup, One, Zero,
 };
 use ark_std::str::FromStr;
 
diff --git a/ed_on_bls12_381_bandersnatch/src/fields/tests.rs b/ed_on_bls12_381_bandersnatch/src/fields/tests.rs
index 401235c..de3aaf2 100644
--- a/ed_on_bls12_381_bandersnatch/src/fields/tests.rs
+++ b/ed_on_bls12_381_bandersnatch/src/fields/tests.rs
@@ -1,10 +1,9 @@
 use crate::{Fq, Fr};
 use ark_algebra_test_templates::*;
-use ark_ec::AdditiveGroup;
 use ark_ff::{
     biginteger::BigInteger256 as BigInteger,
     fields::{Field, LegendreSymbol::*},
-    One, Zero,
+    AdditiveGroup, One, Zero,
 };
 use ark_std::str::FromStr;
 
diff --git a/ed_on_bn254/src/fields/tests.rs b/ed_on_bn254/src/fields/tests.rs
index 5002c5d..299e845 100644
--- a/ed_on_bn254/src/fields/tests.rs
+++ b/ed_on_bn254/src/fields/tests.rs
@@ -1,9 +1,8 @@
 use ark_algebra_test_templates::*;
-use ark_ec::AdditiveGroup;
 use ark_ff::{
     biginteger::BigInteger256 as BigInteger,
     fields::{Field, LegendreSymbol::*},
-    One, Zero,
+    AdditiveGroup, One, Zero,
 };
 use ark_std::str::FromStr;