refactor: Adapt to the deprecation of event_id in PreviousRoom

Signed-off-by: Kévin Commaille <[email protected]>

Author: zecakeh

crates/matrix-sdk-base/src/response_processors/state_events.rs

@@ -558,7 +558,7 @@ mod tests {
                         // Predecessor of room 1 is room 0.
                         event_factory
                             .create(sender, RoomVersionId::try_from("42").unwrap())
-                            .predecessor(room_id_0, tombstone_event_id),
+                            .predecessor(room_id_0),
                     ),
                 )
                 .build_sync_response();
@@ -597,7 +597,7 @@ mod tests {
                         // Predecessor of room 2 is room 1.
                         event_factory
                             .create(sender, RoomVersionId::try_from("43").unwrap())
-                            .predecessor(room_id_1, tombstone_event_id),
+                            .predecessor(room_id_1),
                     ),
                 )
                 .build_sync_response();
@@ -666,7 +666,7 @@ mod tests {
                             // Predecessor of room 1 is room 0.
                             event_factory
                                 .create(sender, RoomVersionId::try_from("42").unwrap())
-                                .predecessor(room_id_0, event_id!("$ev0")),
+                                .predecessor(room_id_0),
                         )
                         .add_timeline_event(
                             // Successor of room 1 is room 2.
@@ -681,7 +681,7 @@ mod tests {
                         // Predecessor of room 2 is room 1.
                         event_factory
                             .create(sender, RoomVersionId::try_from("43").unwrap())
-                            .predecessor(room_id_1, event_id!("$ev1")),
+                            .predecessor(room_id_1),
                     ),
                 )
                 .build_sync_response();
@@ -792,7 +792,7 @@ mod tests {
                         // Predecessor of room 1 is room 0.
                         event_factory
                             .create(sender, RoomVersionId::try_from("42").unwrap())
-                            .predecessor(room_id_0, tombstone_event_id),
+                            .predecessor(room_id_0),
                     ),
                 )
                 .build_sync_response();
@@ -832,7 +832,7 @@ mod tests {
                             // Predecessor of room 2 is room 1.
                             event_factory
                                 .create(sender, RoomVersionId::try_from("43").unwrap())
-                                .predecessor(room_id_1, tombstone_event_id),
+                                .predecessor(room_id_1),
                         )
                         .add_timeline_event(
                             // Successor of room 2 is room 0.
@@ -900,7 +900,7 @@ mod tests {
                     JoinedRoomBuilder::new(room_id_0).add_timeline_event(
                         event_factory
                             .create(sender, RoomVersionId::try_from("42").unwrap())
-                            .predecessor(room_id_0, tombstone_event_id)
+                            .predecessor(room_id_0)
                             .event_id(tombstone_event_id),
                     ),
                 )
@@ -942,7 +942,7 @@ mod tests {
                             // Predecessor of room 0 is room 0
                             event_factory
                                 .create(sender, RoomVersionId::try_from("42").unwrap())
-                                .predecessor(room_id_0, tombstone_event_id),
+                                .predecessor(room_id_0),
                         ),
                 )
                 .build_sync_response();
@@ -982,7 +982,7 @@ mod tests {
                             // Predecessor of room 0 is room 2
                             event_factory
                                 .create(sender, RoomVersionId::try_from("42").unwrap())
-                                .predecessor(room_id_2, event_id!("$ev2")),
+                                .predecessor(room_id_2),
                         )
                         .add_timeline_event(
                             // Successor of room 0 is room 1
@@ -997,7 +997,7 @@ mod tests {
                             // Predecessor of room 1 is room 0
                             event_factory
                                 .create(sender, RoomVersionId::try_from("43").unwrap())
-                                .predecessor(room_id_0, event_id!("$ev0")),
+                                .predecessor(room_id_0),
                         )
                         .add_timeline_event(
                             // Successor of room 1 is room 2
@@ -1012,7 +1012,7 @@ mod tests {
                             // Predecessor of room 2 is room 1
                             event_factory
                                 .create(sender, RoomVersionId::try_from("44").unwrap())
-                                .predecessor(room_id_1, event_id!("$ev1")),
+                                .predecessor(room_id_1),
                         )
                         .add_timeline_event(
                             // Successor of room 2 is room 0

crates/matrix-sdk-base/src/room/tombstone.rs

@@ -111,7 +111,7 @@ mod tests {
     use matrix_sdk_test::{
         async_test, event_factory::EventFactory, JoinedRoomBuilder, SyncResponseBuilder,
     };
-    use ruma::{event_id, room_id, user_id, RoomVersionId};
+    use ruma::{room_id, user_id, RoomVersionId};
 
     use crate::{test_utils::logged_in_base_client, RoomState};
 
@@ -226,7 +226,6 @@ mod tests {
         let sender = user_id!("@mnt_io:matrix.org");
         let room_id = room_id!("!r1");
         let predecessor_room_id = room_id!("!r0");
-        let predecessor_last_event_id = event_id!("$ev42");
         let room = client.get_or_create_room(room_id, RoomState::Joined);
 
         let mut sync_builder = SyncResponseBuilder::new();
@@ -235,7 +234,7 @@ mod tests {
                 JoinedRoomBuilder::new(room_id).add_timeline_event(
                     EventFactory::new()
                         .create(sender, RoomVersionId::V11)
-                        .predecessor(predecessor_room_id, predecessor_last_event_id)
+                        .predecessor(predecessor_room_id)
                         .into_raw_sync(),
                 ),
             )

testing/matrix-sdk-test/src/event_factory.rs

@@ -438,8 +438,8 @@ impl EventBuilder<UnstablePollStartEventContent> {
 
 impl EventBuilder<RoomCreateEventContent> {
     /// Define the predecessor fields.
-    pub fn predecessor(mut self, room_id: &RoomId, event_id: &EventId) -> Self {
-        self.content.predecessor = Some(PreviousRoom::new(room_id.to_owned(), event_id.to_owned()));
+    pub fn predecessor(mut self, room_id: &RoomId) -> Self {
+        self.content.predecessor = Some(PreviousRoom::new(room_id.to_owned()));
         self
     }