try to pass tests

Cosmian · Oct 31, 2024 · 72de55c · 72de55c
1 parent 8d4131c
commit 72de55c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/abe_policy/dimension.rs b/src/abe_policy/dimension.rs
@@ -72,9 +72,9 @@ impl DimensionBuilder {
 #[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
 /// Represents an `Attribute` inside a `Dimension`.
 pub struct AttributeParameters {
-    pub(super) id: u32,
-    pub(super) encryption_hint: EncryptionHint,
-    pub(super) write_status: AttributeStatus,
+    pub(crate) id: u32,
+    pub(crate) encryption_hint: EncryptionHint,
+    pub(crate) write_status: AttributeStatus,
 }
 
 impl AttributeParameters {

diff --git a/src/abe_policy/mod.rs b/src/abe_policy/mod.rs
@@ -30,4 +30,3 @@ pub enum PolicyVersion {
     V1,
     V2,
 }
-
diff --git a/src/core/serialization/mod.rs b/src/core/serialization/mod.rs
@@ -13,7 +13,7 @@ use super::{
     SIGNATURE_LENGTH, SIGNING_KEY_LENGTH, TAG_LENGTH,
 };
 use crate::{
-    abe_policy::{AttributeParameters, Coordinate, Policy},
+    abe_policy::{Coordinate, Policy},
     core::{
         CleartextHeader, Encapsulation, EncryptedHeader, MasterPublicKey, MasterSecretKey,
         SeedEncapsulation, UserSecretKey, SEED_LENGTH,
@@ -541,21 +541,19 @@ impl Serializable for Policy {
 
     fn length(&self) -> usize {
         to_leb128_len(self.version.clone() as usize)
-            + to_leb128_len(self.last_attribute_value.try_into().unwrap())
+            + to_leb128_len(usize::try_from(self.last_attribute_value).unwrap())
             + self
                 .dimensions
                 .iter()
                 .map(|(s, dim)| {
                     to_leb128_len(s.len())
                         + dim
                             .attributes()
-                            .into_iter()
+                            .iter()
                             .map(|d | {
-                                d.id.len() + d.encryption_hint.len() + d.write_status.len()
-                            })
-                            .product::<usize>()
-                })
-                .sum::<usize>()
+                               to_leb128_len(usize::try_from(d.id).unwrap()) + to_leb128_len(d.encryption_hint.clone() as usize) + to_leb128_len(d.write_status.clone() as usize)
+                            }).sum::<usize>()
+                }).sum::<usize>()
     }
 
     fn write(