From e1d7c7dc132b0113397e72cff1c33be14812ea44 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Sat, 29 Jul 2023 18:40:13 +0000
Subject: [PATCH] Migrate to `group::CurveAffine`

---
 Cargo.lock |  5 ++---
 Cargo.toml |  3 ++-
 src/lib.rs | 16 +++++++---------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bdda12c..770715a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -60,7 +60,7 @@ dependencies = [
 [[package]]
 name = "bls12_381"
 version = "0.8.0"
-source = "git+https://github.com/zkcrypto/bls12_381.git?rev=d5df9da6b20619bf77cc432447c02f8f6a6a1fb3#d5df9da6b20619bf77cc432447c02f8f6a6a1fb3"
+source = "git+https://github.com/zkcrypto/bls12_381.git?rev=b859693951a28bb2e44515adbf54395aa8ec7a9a#b859693951a28bb2e44515adbf54395aa8ec7a9a"
 dependencies = [
  "ff",
  "rand_core",
@@ -233,8 +233,7 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 [[package]]
 name = "group"
 version = "0.14.0-pre.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ff6a0b2dd4b981b1ae9e3e6830ab146771f3660d31d57bafd9018805a91b0f1"
+source = "git+https://github.com/zkcrypto/group.git?rev=21104854da7f316c470213ab4a2ace239d24dd28#21104854da7f316c470213ab4a2ace239d24dd28"
 dependencies = [
  "ff",
  "rand_core",
diff --git a/Cargo.toml b/Cargo.toml
index 460f944..63d87d1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,4 +45,5 @@ name = "point_bench"
 harness = false
 
 [patch.crates-io]
-bls12_381 = { git = "https://github.com/zkcrypto/bls12_381.git", rev = "d5df9da6b20619bf77cc432447c02f8f6a6a1fb3" }
+bls12_381 = { git = "https://github.com/zkcrypto/bls12_381.git", rev = "b859693951a28bb2e44515adbf54395aa8ec7a9a" }
+group = { git = "https://github.com/zkcrypto/group.git", rev = "21104854da7f316c470213ab4a2ace239d24dd28" }
diff --git a/src/lib.rs b/src/lib.rs
index 70b245c..fc284fe 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -42,9 +42,9 @@ use core::iter::Sum;
 use core::ops::{Add, AddAssign, Mul, MulAssign, Neg, Sub, SubAssign};
 use ff::{BatchInverter, Field};
 use group::{
-    cofactor::{CofactorCurve, CofactorCurveAffine, CofactorGroup},
+    cofactor::{CofactorCurve, CofactorGroup},
     prime::PrimeGroup,
-    Curve, Group, GroupEncoding,
+    Curve, CurveAffine, Group, GroupEncoding,
 };
 use rand_core::TryRngCore;
 use subtle::{Choice, ConditionallySelectable, ConstantTimeEq, CtOption};
@@ -1354,22 +1354,20 @@ impl CofactorGroup for ExtendedPoint {
 }
 
 impl Curve for ExtendedPoint {
-    type AffineRepr = AffinePoint;
+    type Affine = AffinePoint;
 
-    fn batch_normalize(p: &[Self], q: &mut [Self::AffineRepr]) {
+    fn batch_normalize(p: &[Self], q: &mut [Self::Affine]) {
         Self::batch_normalize(p, q);
     }
 
-    fn to_affine(&self) -> Self::AffineRepr {
+    fn to_affine(&self) -> Self::Affine {
         self.into()
     }
 }
 
-impl CofactorCurve for ExtendedPoint {
-    type Affine = AffinePoint;
-}
+impl CofactorCurve for ExtendedPoint {}
 
-impl CofactorCurveAffine for AffinePoint {
+impl CurveAffine for AffinePoint {
     type Scalar = Fr;
     type Curve = ExtendedPoint;