migrate to new pairing

Cargo.toml

@@ -18,8 +18,7 @@ bit-vec = "0.6"
 cfg-if = "0.1"
 
 # pairing = {package = "pairing_ce", path = "../pairing" }
-# pairing = {package = "pairing_ce", version = "0.19" }
-pairing = {package = "pairing_ce", git = "https://github.com/matter-labs/pairing.git", branch = "affine-ops"}
+pairing = {package = "pairing_ce", version = "0.20" }
 byteorder = "1"
 
 futures= {package = "futures", version = "0.3", default_features = false, features = ["executor"]}
@@ -53,5 +52,4 @@ nolog = []
 plonk = ["blake2s_simd", "lazy_static", "tiny-keccak", "blake2s_const"]
 marlin = ["blake2s_simd", "tiny-keccak", "blake2s_const"]
 wasm = ["web-sys"]
-nightly = ["prefetch"]
-derive_serde = ["pairing/derive_serde"]
+nightly = ["prefetch"]

src/cs.rs

@@ -205,7 +205,7 @@ impl fmt::Display for SynthesisError {
             write!(f, "I/O error: ")?;
             e.fmt(f)
         } else {
-            write!(f, "{}", self.description())
+            write!(f, "{}", self.to_string())
         }
     }
 }

src/plonk/transparent_engine/impl_macro.rs

@@ -186,13 +186,21 @@ macro_rules! transparent_engine_impl {
                 *self
             }
 
+            fn as_xy(&self) -> (&Self::Base, &Self::Base) {
+                (&self, &self)
+            }
+
             fn into_xy_unchecked(&self) -> (Self::Base, Self::Base) {
                 (<$fr as crate::ff::Field>::zero(), <$fr as crate::ff::Field>::zero())
             }
 
             fn from_xy_unchecked(_x: Self::Base, _y: Self::Base) -> Self {
                 <$fr as crate::ff::Field>::zero()
             }
+
+            fn from_xy_checked(_x: Self::Base, _y: Self::Base) -> Result<Self, crate::pairing::GroupDecodingError> {
+                Ok(<$fr as crate::ff::Field>::zero())
+            }
         }
 
         impl crate::pairing::RawEncodable for $fr {

src/plonk/transparent_engine/mod.rs

@@ -103,7 +103,7 @@ mod test {
 
     #[test]
     fn test_proth_field() {
-        use crate::ff::{Field, PrimeField};
+        use crate::ff::{Field, PrimeField, to_hex};
         use super::Fr as FrMontNaive;
         use super::proth::Fr as FrOptimized;
 
@@ -122,9 +122,9 @@ mod test {
         let mut tmp1 = one_optimized;
         tmp1.mul_assign(&one_optimized);
 
-        assert_eq!(tmp0.to_hex(), tmp1.to_hex());
+        assert_eq!(to_hex(&tmp0), to_hex(&tmp1));
 
-        assert_eq!(FrMontNaive::multiplicative_generator().to_hex(), FrOptimized::multiplicative_generator().to_hex());
+        assert_eq!(to_hex(&FrMontNaive::multiplicative_generator()), to_hex(&FrOptimized::multiplicative_generator()));
     }
 
     #[test]

src/tests/dummy_engine.rs

@@ -486,11 +486,19 @@ impl CurveAffine for Fr {
         *self
     }
 
+    fn as_xy(&self) -> (&Self::Base, &Self::Base) {
+        (&self, &self)
+    }
 
     fn into_xy_unchecked(&self) -> (Self::Base, Self::Base) {
         (<Fr as Field>::zero(), <Fr as Field>::zero())
     }
+
     fn from_xy_unchecked(_x: Self::Base, _y: Self::Base) -> Self {
         <Fr as Field>::zero()
     }
+
+    fn from_xy_checked(_x: Self::Base, _y: Self::Base) -> Result<Self, GroupDecodingError> {
+        Ok(<Fr as Field>::zero())
+    }
 }