Made *Proof structs deserializable again

arkworks-rs · Oct 26, 2023 · 5bbf251 · 5bbf251
1 parent 4aa7058
commit 5bbf251
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/ip_proofs/src/gipa.rs b/ip_proofs/src/gipa.rs
@@ -1,5 +1,5 @@
 use ark_ff::{Field, One};
-use ark_serialize::CanonicalSerialize;
+use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
 use ark_std::rand::Rng;
 use ark_std::{end_timer, start_timer};
 use digest::Digest;
@@ -21,7 +21,7 @@ pub struct GIPA<IP, LMC, RMC, IPC, D> {
     _digest: PhantomData<D>,
 }
 
-#[derive(CanonicalSerialize)]
+#[derive(CanonicalSerialize, CanonicalDeserialize)]
 pub struct GIPAProof<IP, LMC, RMC, IPC, D>
 where
     D: Digest,
@@ -45,7 +45,9 @@ where
         (LMC::Output, RMC::Output, IPC::Output),
     )>,
     pub(crate) r_base: (LMC::Message, RMC::Message),
-    _gipa: PhantomData<GIPA<IP, LMC, RMC, IPC, D>>,
+    // The fn() is here because PhantomData<T> is Sync iff T is Sync, and these types are not all
+    // Sync
+    _gipa: PhantomData<fn() -> GIPA<IP, LMC, RMC, IPC, D>>,
 }
 
 #[derive(Clone)]

diff --git a/ip_proofs/src/tipa/mod.rs b/ip_proofs/src/tipa/mod.rs
@@ -1,7 +1,7 @@
 use ark_ec::{pairing::Pairing, scalar_mul::fixed_base::FixedBase, CurveGroup, Group};
 use ark_ff::{Field, One, PrimeField, UniformRand, Zero};
 use ark_poly::polynomial::{univariate::DensePolynomial, DenseUVPolynomial};
-use ark_serialize::CanonicalSerialize;
+use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
 use ark_std::rand::Rng;
 use ark_std::{end_timer, start_timer};
 use digest::Digest;
@@ -38,7 +38,7 @@ pub struct TIPA<IP, LMC, RMC, IPC, P, D> {
     _digest: PhantomData<D>,
 }
 
-#[derive(CanonicalSerialize)]
+#[derive(CanonicalSerialize, CanonicalDeserialize)]
 pub struct TIPAProof<IP, LMC, RMC, IPC, P, D>
 where
     D: Digest,

diff --git a/ip_proofs/src/tipa/structured_scalar_message.rs b/ip_proofs/src/tipa/structured_scalar_message.rs
@@ -1,6 +1,6 @@
 use ark_ec::{pairing::Pairing, Group};
 use ark_ff::{Field, One, PrimeField, UniformRand, Zero};
-use ark_serialize::CanonicalSerialize;
+use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
 use ark_std::{cfg_iter, rand::Rng};
 use ark_std::{end_timer, start_timer};
 use digest::Digest;
@@ -135,7 +135,7 @@ pub struct TIPAWithSSM<IP, LMC, IPC, P, D> {
     _digest: PhantomData<D>,
 }
 
-#[derive(CanonicalSerialize)]
+#[derive(CanonicalSerialize, CanonicalDeserialize)]
 pub struct TIPAWithSSMProof<IP, LMC, IPC, P, D>
 where
     D: Digest,