refactor(base): Remove the event_id field of PredecessorRoom

It is going away in MSC4291, which should be accepted next week.
Removing it now makes sure that no one uses it.

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

Author: zecakeh

bindings/matrix-sdk-ffi/src/room/mod.rs

@@ -1504,13 +1504,10 @@ impl From<SdkSuccessorRoom> for SuccessorRoom {
 pub struct PredecessorRoom {
     /// The ID of the replacement room.
     pub room_id: String,
-
-    /// The event ID of the last known event in the predecesssor room.
-    pub last_event_id: String,
 }
 
 impl From<SdkPredecessorRoom> for PredecessorRoom {
     fn from(value: SdkPredecessorRoom) -> Self {
-        Self { room_id: value.room_id.to_string(), last_event_id: value.last_event_id.to_string() }
+        Self { room_id: value.room_id.to_string() }
     }
 }

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

@@ -14,7 +14,7 @@
 
 use std::ops::Not;
 
-use ruma::{events::room::tombstone::RoomTombstoneEventContent, OwnedEventId, OwnedRoomId};
+use ruma::{events::room::tombstone::RoomTombstoneEventContent, OwnedRoomId};
 
 use super::Room;
 
@@ -67,12 +67,9 @@ impl Room {
     /// [`m.room.tombstone`]: https://spec.matrix.org/v1.14/client-server-api/#mroomtombstone
     /// [`m.room.create`]: https://spec.matrix.org/v1.14/client-server-api/#mroomcreate
     pub fn predecessor_room(&self) -> Option<PredecessorRoom> {
-        self.create_content().and_then(|content_event| content_event.predecessor).map(
-            |predecessor| PredecessorRoom {
-                room_id: predecessor.room_id,
-                last_event_id: predecessor.event_id,
-            },
-        )
+        self.create_content()
+            .and_then(|content_event| content_event.predecessor)
+            .map(|predecessor| PredecessorRoom { room_id: predecessor.room_id })
     }
 }
 
@@ -104,9 +101,6 @@ pub struct SuccessorRoom {
 pub struct PredecessorRoom {
     /// The ID of the old room.
     pub room_id: OwnedRoomId,
-
-    /// The event ID of the last known event in the predecesssor room.
-    pub last_event_id: OwnedEventId,
 }
 
 #[cfg(test)]
@@ -252,7 +246,6 @@ mod tests {
         assert!(room.create_content().is_some());
         assert_matches!(room.predecessor_room(), Some(predecessor_room) => {
             assert_eq!(predecessor_room.room_id, predecessor_room_id);
-            assert_eq!(predecessor_room.last_event_id, predecessor_last_event_id);
         });
     }
 }