From 6d799dd11e479228c16b45d23f164a77714a8279 Mon Sep 17 00:00:00 2001
From: Daniel Salinas <danielsalinas@daniels-mbp-2.myfiosgateway.com>
Date: Tue, 10 Dec 2024 17:07:26 -0500
Subject: [PATCH] Fix broken test related to migrations

---
 .../src/state_store/mod.rs                    |  1 -
 crates/matrix-sdk-sqlite/src/state_store.rs   | 56 +++++++++++++------
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/crates/matrix-sdk-indexeddb/src/state_store/mod.rs b/crates/matrix-sdk-indexeddb/src/state_store/mod.rs
index 3df826e68ba..58ff5de7b53 100644
--- a/crates/matrix-sdk-indexeddb/src/state_store/mod.rs
+++ b/crates/matrix-sdk-indexeddb/src/state_store/mod.rs
@@ -38,7 +38,6 @@ use ruma::{
         presence::PresenceEvent,
         receipt::{Receipt, ReceiptThread, ReceiptType},
         room::{
-            create,
             member::{
                 MembershipState, RoomMemberEventContent, StrippedRoomMemberEvent,
                 SyncRoomMemberEvent,
diff --git a/crates/matrix-sdk-sqlite/src/state_store.rs b/crates/matrix-sdk-sqlite/src/state_store.rs
index 2370b844807..a5d51d0fd0e 100644
--- a/crates/matrix-sdk-sqlite/src/state_store.rs
+++ b/crates/matrix-sdk-sqlite/src/state_store.rs
@@ -2408,23 +2408,22 @@ mod migration_tests {
             let wedge_tx = wedged_event_transaction_id.clone();
             let local_tx = local_event_transaction_id.clone();
 
-            db.save_dependent_queued_request(
-                room_id,
-                &local_tx,
-                ChildTransactionId::new(),
-                MilliSecondsSinceUnixEpoch::now(),
-                DependentQueuedRequestKind::RedactEvent,
-            )
-            .await
-            .unwrap();
-
-            conn.with_transaction(move |txn| {
-                add_send_queue_event_v7(&db, txn, &wedge_tx, room_id, true)?;
-                add_send_queue_event_v7(&db, txn, &local_tx, room_id, false)?;
-                Result::<_, Error>::Ok(())
-            })
-            .await
-            .unwrap();
+            let _ = conn
+                .with_transaction(move |txn| {
+                    add_dependent_send_queue_event_v7(
+                        &db,
+                        txn,
+                        room_id,
+                        &local_tx,
+                        ChildTransactionId::new(),
+                        DependentQueuedRequestKind::RedactEvent,
+                    )?;
+                    add_send_queue_event_v7(&db, txn, &wedge_tx, room_id, true)?;
+                    add_send_queue_event_v7(&db, txn, &local_tx, room_id, false)?;
+                    Result::<_, Error>::Ok(())
+                })
+                .await
+                .unwrap();
         }
 
         // This transparently migrates to the latest version, which clears up all
@@ -2456,6 +2455,29 @@ mod migration_tests {
         txn.prepare_cached("INSERT INTO send_queue_events (room_id, room_id_val, transaction_id, content, wedged) VALUES (?, ?, ?, ?, ?)")?
             .execute((room_id_key, room_id_value, transaction_id.to_string(), content, is_wedged))?;
 
+        Ok(())
+    }
+    fn add_dependent_send_queue_event_v7(
+        this: &SqliteStateStore,
+        txn: &Transaction<'_>,
+        room_id: &RoomId,
+        parent_txn_id: &TransactionId,
+        own_txn_id: ChildTransactionId,
+        content: DependentQueuedRequestKind,
+    ) -> Result<(), Error> {
+        let room_id_value = this.serialize_value(&room_id.to_owned())?;
+
+        let parent_txn_id = parent_txn_id.to_string();
+        let own_txn_id = own_txn_id.to_string();
+        let content = this.serialize_json(&content)?;
+
+        txn.prepare_cached(
+            "INSERT INTO dependent_send_queue_events
+                         (room_id, parent_transaction_id, own_transaction_id, content)
+                       VALUES (?, ?, ?, ?)",
+        )?
+        .execute((room_id_value, parent_txn_id, own_txn_id, content))?;
+
         Ok(())
     }
 }