diff --git a/services/backup/src/database/backup_item.rs b/services/backup/src/database/backup_item.rs --- a/services/backup/src/database/backup_item.rs +++ b/services/backup/src/database/backup_item.rs @@ -4,9 +4,7 @@ use comm_lib::{ backup::BackupVersionInfo, blob::types::BlobInfo, - database::{ - parse_int_attribute, AttributeExtractor, DBItemError, TryFromAttribute, - }, + database::{AttributeExtractor, DBItemError, TryFromAttribute}, }; use std::collections::HashMap; @@ -21,7 +19,6 @@ pub backup_id: String, pub user_keys: BlobInfo, pub siwe_backup_msg: Option, - pub total_size: u64, pub version_info: BackupVersionInfo, } @@ -52,13 +49,6 @@ let siwe_backup_msg: Option = value.take_attr(backup_table::attr::SIWE_BACKUP_MSG)?; - let size_attr = value.remove(backup_table::attr::TOTAL_SIZE); - let total_size = if size_attr.is_some() { - parse_int_attribute(backup_table::attr::TOTAL_SIZE, size_attr)? - } else { - 0u64 - }; - // older backups don't have this attribute let version_info: BackupVersionInfo = value .take_attr::>(backup_table::attr::VERSION_INFO)? @@ -70,7 +60,6 @@ backup_id, user_keys, siwe_backup_msg, - total_size, version_info, }) } diff --git a/shared/comm-lib/src/backup/database.rs b/shared/comm-lib/src/backup/database.rs --- a/shared/comm-lib/src/backup/database.rs +++ b/shared/comm-lib/src/backup/database.rs @@ -28,7 +28,6 @@ pub const USER_KEYS: &str = "userKeys"; pub const ATTACHMENTS: &str = "attachments"; pub const SIWE_BACKUP_MSG: &str = "siweBackupMsg"; - pub const TOTAL_SIZE: &str = "totalSize"; pub const VERSION_INFO: &str = "versionInfo"; pub mod version_info { @@ -49,8 +48,6 @@ pub attachments: Vec, pub siwe_backup_msg: Option, #[serde(default)] - pub total_size: u64, - #[serde(default)] pub version_info: BackupVersionInfo, } @@ -72,7 +69,6 @@ user_data, attachments, siwe_backup_msg, - total_size: 0, version_info, } } @@ -138,10 +134,6 @@ backup_table::attr::USER_KEYS.to_string(), value.user_keys.into(), ), - ( - backup_table::attr::TOTAL_SIZE.to_string(), - AttributeValue::N(value.total_size.to_string()), - ), ( backup_table::attr::VERSION_INFO.to_string(), value.version_info.into(), @@ -214,13 +206,6 @@ let siwe_backup_msg: Option = value.take_attr(backup_table::attr::SIWE_BACKUP_MSG)?; - let size_attr = value.remove(backup_table::attr::TOTAL_SIZE); - let total_size = if size_attr.is_some() { - parse_int_attribute(backup_table::attr::TOTAL_SIZE, size_attr)? - } else { - 0u64 - }; - // older backups don't have this attribute let version_info: BackupVersionInfo = value .take_attr::>(backup_table::attr::VERSION_INFO)? @@ -234,7 +219,6 @@ user_data, attachments, siwe_backup_msg, - total_size, version_info, }) } @@ -304,7 +288,6 @@ let deserialized: BackupItem = serde_json::from_str(payload).expect("failed to deserialized BackupItem"); - assert_eq!(deserialized.total_size, 0u64); assert_eq!(deserialized.version_info.code_version, 0u16); assert_eq!(deserialized.version_info.state_version, 0u16); assert_eq!(deserialized.version_info.db_version, 0u16);