fixup: remove unneeded InboundGroupSessionIndexedDbObject3

matrix-org · Aug 6, 2024 · 9c80560 · 9c80560
1 parent 5585f19
commit 9c80560
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 64 deletions.
diff --git a/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/mod.rs b/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/mod.rs
@@ -25,7 +25,6 @@ use crate::{
 
 mod old_keys;
 mod v0_to_v5;
-mod v10;
 mod v10_to_v11;
 mod v11_to_v12;
 mod v5_to_v7;

diff --git a/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v10.rs b/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/v10.rs
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
@@ -26,10 +26,9 @@ use crate::{
         keys,
         migrations::{
             add_nonunique_index, do_schema_upgrade, old_keys,
-            v10::InboundGroupSessionIndexedDbObject3, v7::InboundGroupSessionIndexedDbObject2,
-            MigrationDb,
+            v7::InboundGroupSessionIndexedDbObject2, MigrationDb,
         },
-        Result,
+        InboundGroupSessionIndexedDbObject, Result,
     },
     IndexeddbCryptoStoreError,
 };
@@ -101,9 +100,11 @@ pub(crate) async fn data_migrate(name: &str, serializer: &IndexeddbSerializer) -
 
             // Serialize the session in the new format
             // This is much the same as [`IndexeddbStore::serialize_inbound_group_session`].
-            let new_value = InboundGroupSessionIndexedDbObject3::new(
+            let new_value = InboundGroupSessionIndexedDbObject::new(
                 serializer.maybe_encrypt_value(session.pickle().await)?,
                 !session.backed_up(),
+                None,
+                None,
             );
 
             // Write it to the new store