diff --git a/tfhe-zk-pok/src/backward_compatibility/pke_v2.rs b/tfhe-zk-pok/src/backward_compatibility/pke_v2.rs index 43af70559..70894811d 100644 --- a/tfhe-zk-pok/src/backward_compatibility/pke_v2.rs +++ b/tfhe-zk-pok/src/backward_compatibility/pke_v2.rs @@ -62,8 +62,8 @@ pub enum ProofVersions { } #[derive(VersionsDispatch)] -#[allow(dead_code)] -pub(crate) enum ComputeLoadProofFieldVersions { +pub(crate) enum ComputeLoadProofFieldsVersions { + #[allow(dead_code)] V0(ComputeLoadProofFields), } @@ -132,11 +132,11 @@ where } #[derive(VersionsDispatch)] -#[allow(dead_code)] pub(crate) enum CompressedComputeLoadProofFieldsVersions where G::G1: Compressible, G::G2: Compressible, { + #[allow(dead_code)] V0(CompressedComputeLoadProofFields), } diff --git a/tfhe-zk-pok/src/proofs/pke_v2.rs b/tfhe-zk-pok/src/proofs/pke_v2.rs index 51f203858..4b3d4d374 100644 --- a/tfhe-zk-pok/src/proofs/pke_v2.rs +++ b/tfhe-zk-pok/src/proofs/pke_v2.rs @@ -2,7 +2,7 @@ #![allow(non_snake_case)] use super::*; -use crate::backward_compatibility::pke_v2::{CompressedProofVersions, ProofVersions}; +use crate::backward_compatibility::pke_v2::*; use crate::backward_compatibility::BoundVersions; use crate::curve_api::{CompressedG1, CompressedG2}; use crate::four_squares::*; @@ -29,7 +29,7 @@ fn bit_iter(x: u64, nbits: u32) -> impl Iterator { serialize = "PublicParams: Into" ) )] -#[versionize(convert = SerializablePKEv2PublicParams)] +#[versionize(try_convert = SerializablePKEv2PublicParams)] pub struct PublicParams { pub(crate) g_lists: GroupElements, pub(crate) D: usize, @@ -299,7 +299,8 @@ impl Proof { /// These fields can be pre-computed on the prover side in the faster Verifier scheme. If that's the /// case, they should be included in the proof. -#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)] +#[derive(Clone, Debug, serde::Serialize, serde::Deserialize, Versionize)] +#[versionize(ComputeLoadProofFieldsVersions)] pub(crate) struct ComputeLoadProofFields { pub(crate) C_hat_h3: G::G2, pub(crate) C_hat_w: G::G2, @@ -331,11 +332,12 @@ where pub(crate) compute_load_proof_fields: Option>, } -#[derive(Serialize, Deserialize)] +#[derive(Serialize, Deserialize, Versionize)] #[serde(bound( deserialize = "G: Curve, CompressedG1: serde::Deserialize<'de>, CompressedG2: serde::Deserialize<'de>", serialize = "G: Curve, CompressedG1: serde::Serialize, CompressedG2: serde::Serialize" ))] +#[versionize(CompressedComputeLoadProofFieldsVersions)] pub(crate) struct CompressedComputeLoadProofFields where G::G1: Compressible,