From 415439bba22bfc448b344806fd80985f3ada18e7 Mon Sep 17 00:00:00 2001 From: phochard Date: Mon, 28 Oct 2024 22:02:12 +0100 Subject: [PATCH] try to pass tests --- src/core/serialization/mod.rs | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/core/serialization/mod.rs b/src/core/serialization/mod.rs index 9fd66d08..32ae8575 100644 --- a/src/core/serialization/mod.rs +++ b/src/core/serialization/mod.rs @@ -118,7 +118,7 @@ impl Serializable for MasterPublicKey { let pk = de.read::()?; coordinate_keys.insert(coordinate, pk); } - let policy = Policy::try_from(de.read()?)?; + let policy = de.read::()?; Ok(Self { tpk, coordinate_keys, @@ -200,7 +200,7 @@ impl Serializable for MasterSecretKey { if let Some(kmac_key) = &self.signing_key { n += ser.write_array(kmac_key)?; } - n += ser.write_vec(&self.policy)?; + n += ser.write(&self.policy)?; Ok(n) } @@ -230,7 +230,7 @@ impl Serializable for MasterSecretKey { )?) }; - let policy = Policy::try_from(de.read()?)?; + let policy = de.read::()?; Ok(Self { s, @@ -540,21 +540,25 @@ impl Serializable for Policy { self.attributes().len() } - fn write(&self, ser: &mut cosmian_crypto_core::bytes_ser_de::Serializer) -> Result { - let n =ser.write(&self.to_bytes())?; + fn write( + &self, + ser: &mut cosmian_crypto_core::bytes_ser_de::Serializer, + ) -> Result { + let n = ser.write(self)?; Ok(n) } fn read(de: &mut cosmian_crypto_core::bytes_ser_de::Deserializer) -> Result { - de.read(); + let n = de.read::()?; + Ok(n) } } + #[cfg(test)] + mod tests { use std::collections::HashMap; - use cosmian_crypto_core::{reexport::rand_core::SeedableRng, CsRng}; - use super::*; use crate::{ abe_policy::{AttributeStatus, EncryptionHint},