Factorize impl_(load|dump) macros in libparsec_types

Author: touilleMan

libparsec/crates/types/src/account.rs

@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
 use serde_with::*;
 use thiserror::Error;
 
+use super::utils::{impl_decrypt_and_load, impl_dump, impl_dump_and_encrypt, impl_load};
 use libparsec_serialization_format::parsec_data;
 
 use crate::{
@@ -27,55 +28,6 @@ pub const AUTH_METHOD_MAC_KEY_DERIVATION_UUID: uuid::Uuid =
 pub const AUTH_METHOD_SECRET_KEY_DERIVATION_UUID: uuid::Uuid =
     uuid::uuid!("22222222-2222-2222-2222-222222222222");
 
-/*
- * Helpers
- */
-
-macro_rules! impl_dump {
-    ($name:ident) => {
-        impl $name {
-            pub fn dump(&self) -> Vec<u8> {
-                format_v0_dump(&self)
-            }
-        }
-    };
-}
-
-macro_rules! impl_dump_and_encrypt {
-    ($name:ident) => {
-        impl $name {
-            pub fn dump_and_encrypt(&self, key: &::libparsec_crypto::SecretKey) -> Vec<u8> {
-                let serialized = format_v0_dump(&self);
-                key.encrypt(&serialized)
-            }
-        }
-    };
-}
-
-macro_rules! impl_load {
-    ($name:ident) => {
-        impl $name {
-            pub fn load(serialized: &[u8]) -> Result<$name, DataError> {
-                format_vx_load(&serialized)
-            }
-        }
-    };
-}
-
-macro_rules! impl_decrypt_and_load {
-    ($name:ident) => {
-        impl $name {
-            pub fn decrypt_and_load(
-                encrypted: &[u8],
-                key: &::libparsec_crypto::SecretKey,
-            ) -> Result<$name, DataError> {
-                let serialized = key.decrypt(encrypted).map_err(|_| DataError::Decryption)?;
-                format_vx_load(&serialized)
-            }
-        }
-    };
-}
-
 /*
  * ValidationCode
  */

libparsec/crates/types/src/async_enrollment.rs

@@ -5,6 +5,7 @@ use serde::{Deserialize, Serialize};
 
 use libparsec_serialization_format::parsec_data;
 
+use super::utils::{impl_dump, impl_load};
 use crate::{
     self as libparsec_types,
     data_macros::impl_transparent_data_format_conversion,
@@ -13,30 +14,6 @@ use crate::{
     ParsecAddr, PublicKey, UserID, UserProfile, VerifyKey,
 };
 
-/*
- * Helpers
- */
-
-macro_rules! impl_dump {
-    ($name:ident) => {
-        impl $name {
-            pub fn dump(&self) -> Vec<u8> {
-                format_v0_dump(&self)
-            }
-        }
-    };
-}
-
-macro_rules! impl_load {
-    ($name:ident) => {
-        impl $name {
-            pub fn load(serialized: &[u8]) -> Result<$name, DataError> {
-                format_vx_load(&serialized)
-            }
-        }
-    };
-}
-
 /*
  * AsyncEnrollmentSubmitPayload
  */

libparsec/crates/types/src/lib.rs

@@ -79,6 +79,7 @@ mod serialization;
 mod shamir;
 mod time;
 mod token;
+mod utils;
 
 pub use account::*;
 pub use addr::*;

libparsec/crates/types/src/utils.rs

@@ -0,0 +1,55 @@
+// Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
+
+/*
+ * Helpers
+ */
+
+macro_rules! impl_dump {
+    ($name:ident) => {
+        impl $name {
+            pub fn dump(&self) -> Vec<u8> {
+                format_v0_dump(&self)
+            }
+        }
+    };
+}
+
+macro_rules! impl_dump_and_encrypt {
+    ($name:ident) => {
+        impl $name {
+            pub fn dump_and_encrypt(&self, key: &::libparsec_crypto::SecretKey) -> Vec<u8> {
+                let serialized = format_v0_dump(&self);
+                key.encrypt(&serialized)
+            }
+        }
+    };
+}
+
+macro_rules! impl_load {
+    ($name:ident) => {
+        impl $name {
+            pub fn load(serialized: &[u8]) -> Result<$name, DataError> {
+                format_vx_load(&serialized)
+            }
+        }
+    };
+}
+
+macro_rules! impl_decrypt_and_load {
+    ($name:ident) => {
+        impl $name {
+            pub fn decrypt_and_load(
+                encrypted: &[u8],
+                key: &::libparsec_crypto::SecretKey,
+            ) -> Result<$name, DataError> {
+                let serialized = key.decrypt(encrypted).map_err(|_| DataError::Decryption)?;
+                format_vx_load(&serialized)
+            }
+        }
+    };
+}
+
+pub(super) use impl_decrypt_and_load;
+pub(super) use impl_dump;
+pub(super) use impl_dump_and_encrypt;
+pub(super) use impl_load;