patch dependencies and fix imports

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/" }

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,

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;
 

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;
 

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;