refactor(indexeddb): change indexeddb_serializer::Result to use IndexeddbSerializerError

Signed-off-by: Michael Goldenberg <[email protected]>

Author: mgoldenberg

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;

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`.

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,
 };
 

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,
 };
 

crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v8_to_v10.rs

@@ -22,14 +22,14 @@ use web_sys::{DomException, IdbTransactionMode};
 
 use crate::{
     crypto_store::{
-        indexeddb_serializer::IndexeddbSerializer,
         keys,
         migrations::{
             add_nonunique_index, do_schema_upgrade, old_keys,
             v7::InboundGroupSessionIndexedDbObject2, MigrationDb,
         },
         InboundGroupSessionIndexedDbObject, Result,
     },
+    indexeddb_serializer::IndexeddbSerializer,
     IndexeddbCryptoStoreError,
 };
 

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 {

crates/matrix-sdk-indexeddb/src/crypto_store/indexeddb_serializer.rs renamed to 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<A, E = IndexeddbCryptoStoreError> = std::result::Result<A, E>;
+type Result<A, E = IndexeddbSerializerError> = std::result::Result<A, E>;
 
 const BASE64: GeneralPurpose = GeneralPurpose::new(&alphabet::STANDARD, general_purpose::NO_PAD);
 

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;