refactor(indexeddb): remove transaction arg from do_schema_upgrade() callback in crypto store

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

Author: mgoldenberg

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

@@ -200,13 +200,12 @@ type OldVersion = u32;
 /// * `name` - name of the indexeddb database to be upgraded.
 /// * `version` - version we are upgrading to.
 /// * `f` - closure which will be called if the database is below the version
-///   given. It will be called with three arguments `(db, txn, oldver)`, where:
+///   given. It will be called with two arguments `(db, oldver)`, where:
 ///   * `db` - the [`IdbDatabase`]
-///   * `txn` - the database transaction: a [`IdbTransaction`]
 ///   * `oldver` - the version number before the upgrade.
 async fn do_schema_upgrade<F>(name: &str, version: u32, f: F) -> Result<(), DomException>
 where
-    F: Fn(&IdbDatabase, IdbTransaction<'_>, OldVersion) -> Result<(), JsValue> + 'static,
+    F: Fn(&IdbDatabase, OldVersion) -> Result<(), JsValue> + 'static,
 {
     info!("IndexeddbCryptoStore upgrade schema -> v{version} starting");
     let mut db_req: OpenDbRequest = IdbDatabase::open_u32(name, version)?;
@@ -218,7 +217,7 @@ where
         let old_version = evt.old_version() as u32;
 
         // Run the upgrade code we were supplied
-        f(evt.db(), evt.transaction(), old_version)
+        f(evt.db(), old_version)
     }));
 
     let db = db_req.await?;

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

@@ -26,7 +26,7 @@ use crate::crypto_store::{
 
 /// Perform schema migrations as needed, up to schema version 5.
 pub(crate) async fn schema_add(name: &str) -> Result<(), DomException> {
-    do_schema_upgrade(name, 5, |db, _, old_version| {
+    do_schema_upgrade(name, 5, |db, old_version| {
         // An old_version of 1 could either mean actually the first version of the
         // schema, or a completely empty schema that has been created with a
         // call to `IdbDatabase::open` with no explicit "version". So, to determine

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

@@ -59,5 +59,5 @@ pub(crate) async fn data_migrate(
 pub(crate) async fn schema_bump(name: &str) -> crate::crypto_store::Result<(), DomException> {
     // Just bump the version number to 11 to demonstrate that we have run the data
     // changes from data_migrate.
-    do_schema_upgrade(name, 11, |_, _, _| Ok(())).await
+    do_schema_upgrade(name, 11, |_, _| Ok(())).await
 }

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

@@ -18,5 +18,5 @@ use crate::crypto_store::{migrations::do_schema_upgrade, Result};
 
 /// Perform the schema upgrade v11 to v12, just bumping the schema version
 pub(crate) async fn schema_bump(name: &str) -> Result<(), DomException> {
-    do_schema_upgrade(name, 12, |_, _, _| Ok(())).await
+    do_schema_upgrade(name, 12, |_, _| Ok(())).await
 }

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

@@ -21,7 +21,7 @@ use crate::crypto_store::{keys, migrations::do_schema_upgrade, Result};
 /// Perform the schema upgrade v12 to v13, adding the
 /// `received_room_key_bundles` store.
 pub(crate) async fn schema_add(name: &str) -> Result<(), DomException> {
-    do_schema_upgrade(name, 13, |db, _, _| {
+    do_schema_upgrade(name, 13, |db, _| {
         db.create_object_store(keys::RECEIVED_ROOM_KEY_BUNDLES)?;
         Ok(())
     })

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

@@ -30,7 +30,7 @@ use crate::{
 /// This creates an identical object store to `inbound_group_sessions3`, but
 /// adds index on `(curve_key, sender_data_type, session_id)`.
 pub(crate) async fn schema_add(name: &str) -> Result<(), DomException> {
-    do_schema_upgrade(name, 14, |db, _, _| {
+    do_schema_upgrade(name, 14, |db, _| {
         let object_store = db.create_object_store(keys::INBOUND_GROUP_SESSIONS_V4)?;
         v8_to_v10::index_add(&object_store)?;
         object_store.create_index(
@@ -104,7 +104,7 @@ pub(crate) async fn data_migrate(name: &str, serializer: &IndexeddbSerializer) -
 
 /// Perform the schema upgrade v14 to v15, deleting `inbound_group_sessions3`.
 pub(crate) async fn schema_delete(name: &str) -> Result<(), DomException> {
-    do_schema_upgrade(name, 15, |db, _, _| {
+    do_schema_upgrade(name, 15, |db, _| {
         db.delete_object_store(old_keys::INBOUND_GROUP_SESSIONS_V3)?;
         Ok(())
     })

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

@@ -36,7 +36,7 @@ use crate::{
 
 /// Perform the schema upgrade v5 to v6, creating `inbound_group_sessions2`.
 pub(crate) async fn schema_add(name: &str) -> Result<(), DomException> {
-    do_schema_upgrade(name, 6, |db, _, _| {
+    do_schema_upgrade(name, 6, |db, _| {
         let object_store = db.create_object_store(old_keys::INBOUND_GROUP_SESSIONS_V2)?;
 
         add_nonunique_index(
@@ -109,7 +109,7 @@ pub(crate) async fn data_migrate(name: &str, serializer: &IndexeddbSerializer) -
 
 /// Perform the schema upgrade v6 to v7, deleting `inbound_group_sessions`.
 pub(crate) async fn schema_delete(name: &str) -> Result<(), DomException> {
-    do_schema_upgrade(name, 7, |db, _, _| {
+    do_schema_upgrade(name, 7, |db, _| {
         db.delete_object_store(old_keys::INBOUND_GROUP_SESSIONS_V1)?;
         Ok(())
     })

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

@@ -116,7 +116,7 @@ pub(crate) async fn data_migrate(name: &str, serializer: &IndexeddbSerializer) -
 
 /// Perform the schema upgrade v7 to v8, Just bumping the schema version.
 pub(crate) async fn schema_bump(name: &str) -> Result<(), DomException> {
-    do_schema_upgrade(name, 8, |_, _, _| {
+    do_schema_upgrade(name, 8, |_, _| {
         // Just bump the version number to 8 to demonstrate that we have run the data
         // changes from prepare_data_for_v8.
         Ok(())

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

@@ -50,7 +50,7 @@ pub(crate) fn index_add(object_store: &IdbObjectStore<'_>) -> Result<(), DomExce
 
 /// Perform the schema upgrade v8 to v9, creating `inbound_group_sessions3`.
 pub(crate) async fn schema_add(name: &str) -> Result<(), DomException> {
-    do_schema_upgrade(name, 9, |db, _, _| {
+    do_schema_upgrade(name, 9, |db, _| {
         let object_store = db.create_object_store(old_keys::INBOUND_GROUP_SESSIONS_V3)?;
         index_add(&object_store)?;
         Ok(())
@@ -128,7 +128,7 @@ pub(crate) async fn data_migrate(name: &str, serializer: &IndexeddbSerializer) -
 
 /// Perform the schema upgrade v8 to v10, deleting `inbound_group_sessions2`.
 pub(crate) async fn schema_delete(name: &str) -> Result<(), DomException> {
-    do_schema_upgrade(name, 10, |db, _, _| {
+    do_schema_upgrade(name, 10, |db, _| {
         db.delete_object_store(old_keys::INBOUND_GROUP_SESSIONS_V2)?;
         Ok(())
     })