Rename CertifOps to CertificateOps.

libparsec/crates/client/src/certif/add.rs

@@ -6,7 +6,7 @@ use libparsec_types::prelude::*;
 
 use super::{
     store::{CertificatesStoreWriteGuard, GetCertificateError},
-    CertifOps, UpTo,
+    CertificateOps, UpTo,
 };
 use crate::{event_bus::EventInvalidCertificate, EventNewCertificates};
 
@@ -132,7 +132,7 @@ pub enum MaybeRedactedSwitch {
 }
 
 pub(super) async fn add_certificates_batch(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     common_certificates: &[Bytes],
     sequester_certificates: &[Bytes],
@@ -379,7 +379,7 @@ macro_rules! verify_certificate_signature {
 /// Validate the given certificate by both checking it content (format, signature, etc.)
 /// and it global consistency with the others certificates.
 async fn validate_common_certificate(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     signed: Bytes,
 ) -> Result<CommonTopicArcCertificate, CertifAddCertificatesBatchError> {
@@ -442,7 +442,7 @@ async fn validate_common_certificate(
 /// Validate the given certificate by both checking it content (format, signature, etc.)
 /// and it global consistency with the others certificates.
 async fn validate_realm_certificate(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     realm_id: VlobID,
     signed: Bytes,
@@ -552,7 +552,7 @@ async fn validate_realm_certificate(
 /// Validate the given certificate by both checking it content (format, signature, etc.)
 /// and it global consistency with the others certificates.
 async fn validate_shamir_recovery_certificate(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     signed: Bytes,
 ) -> Result<ShamirRecoveryTopicArcCertificate, CertifAddCertificatesBatchError> {
@@ -613,7 +613,7 @@ async fn validate_shamir_recovery_certificate(
 /// Validate the given certificate by both checking it content (format, signature, etc.)
 /// and it global consistency with the others certificates.
 async fn validate_sequester_certificate(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     signed: Bytes,
 ) -> Result<SequesterTopicArcCertificate, CertifAddCertificatesBatchError> {
@@ -634,7 +634,7 @@ async fn validate_sequester_certificate(
 }
 
 async fn validate_sequester_authority_certificate(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     signed: Bytes,
 ) -> Result<Arc<SequesterAuthorityCertificate>, CertifAddCertificatesBatchError> {
@@ -799,7 +799,7 @@ async fn check_user_not_revoked(
 /// Admin existence has already been checked while fetching it device's verify key,
 /// so what's left is checking it is not revoked and (optionally) it profile
 async fn check_author_not_revoked_and_profile(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     up_to: DateTime,
     author: UserID,
@@ -886,7 +886,7 @@ async fn get_user_profile(
 }
 
 async fn check_user_certificate_consistency(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     cooked: &UserCertificate,
     author_user_id: Option<UserID>,
@@ -1008,7 +1008,7 @@ async fn check_user_certificate_consistency(
 }
 
 async fn check_device_certificate_consistency(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     cooked: &DeviceCertificate,
     author_user_id: Option<UserID>,
@@ -1162,7 +1162,7 @@ async fn check_device_certificate_consistency(
 }
 
 async fn check_user_update_certificate_consistency(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     cooked: &UserUpdateCertificate,
     author_user_id: UserID,
@@ -1273,7 +1273,7 @@ async fn check_user_update_certificate_consistency(
 }
 
 async fn check_revoked_user_certificate_consistency(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     cooked: &RevokedUserCertificate,
     author_user_id: UserID,
@@ -1503,7 +1503,7 @@ async fn check_realm_role_certificate_consistency(
 }
 
 async fn check_realm_name_certificate_consistency(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     cooked: &RealmNameCertificate,
     author_user_id: UserID,
@@ -1590,7 +1590,7 @@ async fn check_realm_name_certificate_consistency(
 }
 
 async fn check_realm_key_rotation_certificate_consistency(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     cooked: &RealmKeyRotationCertificate,
     author_user_id: UserID,
@@ -1677,7 +1677,7 @@ async fn check_realm_key_rotation_certificate_consistency(
 }
 
 async fn check_realm_archiving_certificate_consistency(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     cooked: &RealmArchivingCertificate,
     author_user_id: UserID,
@@ -1764,7 +1764,7 @@ async fn check_realm_archiving_certificate_consistency(
 }
 
 async fn check_shamir_recovery_brief_certificate_consistency(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     cooked: &ShamirRecoveryBriefCertificate,
     author_user_id: UserID,
@@ -1843,7 +1843,7 @@ async fn check_shamir_recovery_brief_certificate_consistency(
 }
 
 async fn check_shamir_recovery_share_certificate_consistency(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     cooked: &ShamirRecoveryShareCertificate,
     author_user_id: UserID,

libparsec/crates/client/src/certif/block_validate.rs

@@ -9,7 +9,7 @@ use crate::{
 };
 
 use super::{
-    store::CertifForReadWithRequirementsError, CertifOps, InvalidCertificateError,
+    store::CertifForReadWithRequirementsError, CertificateOps, InvalidCertificateError,
     InvalidKeysBundleError,
 };
 #[derive(Debug, thiserror::Error)]
@@ -65,7 +65,7 @@ pub enum CertifValidateBlockError {
 }
 
 pub(super) async fn validate_block(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     needed_realm_certificate_timestamp: DateTime,
     realm_id: VlobID,
     key_index: IndexInt,

libparsec/crates/client/src/certif/list.rs

@@ -6,7 +6,7 @@ use libparsec_types::prelude::*;
 
 use super::{
     store::{CertifStoreError, GetCertificateError},
-    CertifOps, UpTo,
+    CertificateOps, UpTo,
 };
 
 pub use super::store::CertifStoreError as CertifGetCurrentSelfProfileError;
@@ -17,7 +17,7 @@ pub use super::store::CertifStoreError as CertifListUserDevicesError;
 pub use super::store::CertifStoreError as CertifListWorkspaceUsersError;
 
 pub(super) async fn get_current_self_profile(
-    ops: &CertifOps,
+    ops: &CertificateOps,
 ) -> Result<UserProfile, CertifGetCurrentSelfProfileError> {
     ops.store
         .for_read(|store| store.get_current_self_profile())
@@ -26,7 +26,7 @@ pub(super) async fn get_current_self_profile(
 }
 
 pub(super) async fn get_current_self_realms_role(
-    ops: &CertifOps,
+    ops: &CertificateOps,
 ) -> Result<Vec<(VlobID, Option<RealmRole>, DateTime)>, CertifGetCurrentSelfRealmsRoleError> {
     // TODO: cache !
     let certifs = ops
@@ -55,7 +55,7 @@ pub(super) async fn get_current_self_realms_role(
 }
 
 pub(super) async fn get_current_self_realm_role(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     realm_id: VlobID,
 ) -> Result<Option<Option<RealmRole>>, CertifGetCurrentSelfRealmRoleError> {
     // TODO: cache !
@@ -87,7 +87,7 @@ pub struct UserInfo {
 }
 
 pub(super) async fn list_users(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     skip_revoked: bool,
     offset: Option<u32>,
     limit: Option<u32>,
@@ -163,7 +163,7 @@ pub struct DeviceInfo {
 }
 
 pub(super) async fn list_user_devices(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     user_id: UserID,
 ) -> Result<Vec<DeviceInfo>, CertifListUserDevicesError> {
     let certifs = ops
@@ -211,7 +211,7 @@ impl From<CertifStoreError> for CertifGetUserDeviceError {
 }
 
 pub(super) async fn get_user_device(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     device_id: DeviceID,
 ) -> Result<(UserInfo, DeviceInfo), CertifGetUserDeviceError> {
     ops.store
@@ -316,7 +316,7 @@ pub struct WorkspaceUserAccessInfo {
 /// List users currently part of the given workspace (i.e. user not revoked
 /// and with a valid role)
 pub(super) async fn list_workspace_users(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     realm_id: VlobID,
 ) -> Result<Vec<WorkspaceUserAccessInfo>, CertifListWorkspaceUsersError> {
     ops.store

libparsec/crates/client/src/certif/manifest_validate.rs

@@ -7,7 +7,7 @@ use crate::{certif::realm_keys_bundle, CertifDecryptForRealmError, EncrytionUsag
 
 use super::{
     store::{CertifForReadWithRequirementsError, CertificatesStoreReadGuard, GetCertificateError},
-    CertifOps, InvalidCertificateError, InvalidKeysBundleError, UpTo,
+    CertificateOps, InvalidCertificateError, InvalidKeysBundleError, UpTo,
 };
 
 #[derive(Debug, thiserror::Error)]
@@ -102,7 +102,7 @@ pub enum CertifValidateManifestError {
 }
 
 pub(super) async fn validate_user_manifest(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     needed_realm_certificate_timestamp: DateTime,
     needed_common_certificate_timestamp: DateTime,
     author: DeviceID,
@@ -166,7 +166,7 @@ pub(super) async fn validate_user_manifest(
 
 #[allow(clippy::too_many_arguments)]
 pub(super) async fn validate_workspace_manifest(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     needed_realm_certificate_timestamp: DateTime,
     needed_common_certificate_timestamp: DateTime,
     realm_id: VlobID,
@@ -288,7 +288,7 @@ pub(super) async fn validate_workspace_manifest(
 
 #[allow(clippy::too_many_arguments)]
 pub(super) async fn validate_child_manifest(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     needed_realm_certificate_timestamp: DateTime,
     needed_common_certificate_timestamp: DateTime,
     realm_id: VlobID,

libparsec/crates/client/src/certif/mod.rs

@@ -66,7 +66,7 @@ pub enum CertificateBasedActionOutcome {
 }
 
 #[derive(Debug)]
-pub(crate) struct CertifOps {
+pub(crate) struct CertificateOps {
     #[allow(unused)]
     config: Arc<ClientConfig>,
     device: Arc<LocalDevice>,
@@ -77,7 +77,7 @@ pub(crate) struct CertifOps {
 
 // For readability, we define the public interface here and let the actual
 // implementation in separated submodules
-impl CertifOps {
+impl CertificateOps {
     pub async fn start(
         config: Arc<ClientConfig>,
         device: Arc<LocalDevice>,

libparsec/crates/client/src/certif/poll.rs

@@ -7,7 +7,7 @@ use libparsec_types::prelude::*;
 
 use super::{
     store::{CertifStoreError, CertificatesStoreWriteGuard},
-    CertifAddCertificatesBatchError, CertifOps, InvalidCertificateError, MaybeRedactedSwitch,
+    CertifAddCertificatesBatchError, CertificateOps, InvalidCertificateError, MaybeRedactedSwitch,
 };
 
 #[derive(Debug, thiserror::Error)]
@@ -60,7 +60,7 @@ impl From<CertifStoreError> for CertifPollServerError {
 /// to avoid concurrency access changing certificates and breaking the deterministic
 /// order certificates must be added on.
 pub(super) async fn poll_server_for_new_certificates(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     requirements: Option<&PerTopicLastTimestamps>,
 ) -> Result<(), CertifPollServerError> {
@@ -94,7 +94,7 @@ pub(super) async fn poll_server_for_new_certificates(
 }
 
 async fn poll_server_and_add_certificates(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     store: &mut CertificatesStoreWriteGuard<'_>,
     last_stored_timestamps: PerTopicLastTimestamps,
 ) -> Result<MaybeRedactedSwitch, CertifPollServerError> {

libparsec/crates/client/src/certif/realm_create.rs

@@ -4,7 +4,7 @@ use libparsec_client_connection::ConnectionError;
 use libparsec_protocol::authenticated_cmds;
 use libparsec_types::prelude::*;
 
-use super::{store::CertifStoreError, CertifOps, CertificateBasedActionOutcome, UpTo};
+use super::{store::CertifStoreError, CertificateBasedActionOutcome, CertificateOps, UpTo};
 use crate::EventTooMuchDriftWithServerClock;
 
 #[derive(Debug, thiserror::Error)]
@@ -46,7 +46,7 @@ impl From<CertifStoreError> for CertifEnsureRealmCreatedError {
 }
 
 pub(super) async fn ensure_realm_created(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     realm_id: VlobID,
 ) -> Result<CertificateBasedActionOutcome, CertifEnsureRealmCreatedError> {
     let is_created = ops
@@ -74,7 +74,7 @@ pub(super) async fn ensure_realm_created(
 }
 
 async fn create_realm_idempotent(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     realm_id: VlobID,
 ) -> Result<CertificateBasedActionOutcome, CertifEnsureRealmCreatedError> {
     let mut timestamp = ops.device.now();

libparsec/crates/client/src/certif/realm_decrypt_name.rs

@@ -4,7 +4,9 @@ use libparsec_types::prelude::*;
 
 use crate::{CertifDecryptForRealmError, EncrytionUsage};
 
-use super::{realm_keys_bundle, store::CertifStoreError, CertifOps, InvalidKeysBundleError, UpTo};
+use super::{
+    realm_keys_bundle, store::CertifStoreError, CertificateOps, InvalidKeysBundleError, UpTo,
+};
 
 #[derive(Debug, thiserror::Error)]
 pub enum InvalidEncryptedRealmNameError {
@@ -58,7 +60,7 @@ pub enum CertifDecryptCurrentRealmNameError {
 }
 
 pub(super) async fn decrypt_current_realm_name(
-    ops: &CertifOps,
+    ops: &CertificateOps,
     realm_id: VlobID,
 ) -> Result<(EntryName, DateTime), CertifDecryptCurrentRealmNameError> {
     ops.store