From 77ee7f1d19ebf257a10ae0a40aba562cc48489b9 Mon Sep 17 00:00:00 2001 From: Michael Goldenberg Date: Thu, 1 May 2025 13:37:58 -0400 Subject: [PATCH] refactor(indexeddb): change indexeddb_serializer::Result to use IndexeddbSerializerError Signed-off-by: Michael Goldenberg --- .../src/crypto_store/migrations/mod.rs | 3 +-- .../src/crypto_store/migrations/v10_to_v11.rs | 2 +- .../src/crypto_store/migrations/v5_to_v7.rs | 2 +- .../src/crypto_store/migrations/v7_to_v8.rs | 2 +- .../src/crypto_store/migrations/v8_to_v10.rs | 2 +- crates/matrix-sdk-indexeddb/src/crypto_store/mod.rs | 8 ++------ .../src/{crypto_store => }/indexeddb_serializer.rs | 4 ++-- crates/matrix-sdk-indexeddb/src/lib.rs | 2 ++ 8 files changed, 11 insertions(+), 14 deletions(-) rename crates/matrix-sdk-indexeddb/src/{crypto_store => }/indexeddb_serializer.rs (99%) diff --git a/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/mod.rs b/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/mod.rs index 2ba66c426..eea0b0c80 100644 --- a/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/mod.rs +++ b/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/mod.rs @@ -19,8 +19,7 @@ use tracing::info; use wasm_bindgen::JsValue; use crate::{ - crypto_store::{indexeddb_serializer::IndexeddbSerializer, Result}, - IndexeddbCryptoStoreError, + crypto_store::Result, indexeddb_serializer::IndexeddbSerializer, IndexeddbCryptoStoreError, }; mod old_keys; diff --git a/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v10_to_v11.rs b/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v10_to_v11.rs index 11de8b32a..7201d80ab 100644 --- a/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v10_to_v11.rs +++ b/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v10_to_v11.rs @@ -20,10 +20,10 @@ use wasm_bindgen::JsValue; use web_sys::{DomException, IdbTransactionMode}; use crate::crypto_store::{ - indexeddb_serializer::IndexeddbSerializer, keys, migrations::{do_schema_upgrade, old_keys, MigrationDb}, }; +use crate::indexeddb_serializer::IndexeddbSerializer; /// Migrate data from `backup_keys.backup_key_v1` to /// `backup_keys.backup_version_v1`. diff --git a/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v5_to_v7.rs b/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v5_to_v7.rs index 473960b3f..b1a0ad14d 100644 --- a/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v5_to_v7.rs +++ b/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v5_to_v7.rs @@ -26,11 +26,11 @@ use web_sys::{DomException, IdbTransactionMode}; use crate::{ crypto_store::{ - indexeddb_serializer::IndexeddbSerializer, keys, migrations::{add_nonunique_index, do_schema_upgrade, old_keys, v7, MigrationDb}, Result, }, + indexeddb_serializer::IndexeddbSerializer, IndexeddbCryptoStoreError, }; diff --git a/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v7_to_v8.rs b/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v7_to_v8.rs index 9cba57a7b..e25fa1406 100644 --- a/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v7_to_v8.rs +++ b/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v7_to_v8.rs @@ -22,10 +22,10 @@ use web_sys::{DomException, IdbTransactionMode}; use crate::{ crypto_store::{ - indexeddb_serializer::IndexeddbSerializer, migrations::{do_schema_upgrade, old_keys, v7, MigrationDb}, Result, }, + indexeddb_serializer::IndexeddbSerializer, IndexeddbCryptoStoreError, }; diff --git a/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v8_to_v10.rs b/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v8_to_v10.rs index e180b5649..176358fd2 100644 --- a/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v8_to_v10.rs +++ b/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v8_to_v10.rs @@ -22,7 +22,6 @@ use web_sys::{DomException, IdbTransactionMode}; use crate::{ crypto_store::{ - indexeddb_serializer::IndexeddbSerializer, keys, migrations::{ add_nonunique_index, do_schema_upgrade, old_keys, @@ -30,6 +29,7 @@ use crate::{ }, InboundGroupSessionIndexedDbObject, Result, }, + indexeddb_serializer::IndexeddbSerializer, IndexeddbCryptoStoreError, }; diff --git a/crates/matrix-sdk-indexeddb/src/crypto_store/mod.rs b/crates/matrix-sdk-indexeddb/src/crypto_store/mod.rs index e7855eb97..b0c2ed6a5 100644 --- a/crates/matrix-sdk-indexeddb/src/crypto_store/mod.rs +++ b/crates/matrix-sdk-indexeddb/src/crypto_store/mod.rs @@ -21,7 +21,6 @@ use async_trait::async_trait; use gloo_utils::format::JsValueSerdeExt; use hkdf::Hkdf; use indexed_db_futures::prelude::*; -use indexeddb_serializer::IndexeddbSerializerError; use js_sys::Array; use matrix_sdk_crypto::{ olm::{ @@ -48,12 +47,9 @@ use tracing::{debug, warn}; use wasm_bindgen::JsValue; use web_sys::IdbKeyRange; -use self::indexeddb_serializer::MaybeEncrypted; -use crate::crypto_store::{ - indexeddb_serializer::IndexeddbSerializer, migrations::open_and_upgrade_db, -}; +use crate::crypto_store::migrations::open_and_upgrade_db; +use crate::indexeddb_serializer::{IndexeddbSerializer, IndexeddbSerializerError, MaybeEncrypted}; -mod indexeddb_serializer; mod migrations; mod keys { diff --git a/crates/matrix-sdk-indexeddb/src/crypto_store/indexeddb_serializer.rs b/crates/matrix-sdk-indexeddb/src/indexeddb_serializer.rs similarity index 99% rename from crates/matrix-sdk-indexeddb/src/crypto_store/indexeddb_serializer.rs rename to crates/matrix-sdk-indexeddb/src/indexeddb_serializer.rs index ae8fbbbff..0cecf36c0 100644 --- a/crates/matrix-sdk-indexeddb/src/crypto_store/indexeddb_serializer.rs +++ b/crates/matrix-sdk-indexeddb/src/indexeddb_serializer.rs @@ -27,9 +27,9 @@ use wasm_bindgen::JsValue; use web_sys::IdbKeyRange; use zeroize::Zeroizing; -use crate::{safe_encode::SafeEncode, IndexeddbCryptoStoreError}; +use crate::safe_encode::SafeEncode; -type Result = std::result::Result; +type Result = std::result::Result; const BASE64: GeneralPurpose = GeneralPurpose::new(&alphabet::STANDARD, general_purpose::NO_PAD); diff --git a/crates/matrix-sdk-indexeddb/src/lib.rs b/crates/matrix-sdk-indexeddb/src/lib.rs index a828ac675..eae560bab 100644 --- a/crates/matrix-sdk-indexeddb/src/lib.rs +++ b/crates/matrix-sdk-indexeddb/src/lib.rs @@ -6,6 +6,8 @@ use thiserror::Error; #[cfg(feature = "e2e-encryption")] mod crypto_store; +#[cfg(feature = "e2e-encryption")] +mod indexeddb_serializer; mod safe_encode; #[cfg(feature = "e2e-encryption")] mod serialize_bool_for_indexeddb;