From 0e30d85df4e769ab723863d77e36de07575bf8b4 Mon Sep 17 00:00:00 2001
From: Andy Balaam <andy.balaam@matrix.org>
Date: Thu, 8 Jun 2023 08:57:23 +0100
Subject: [PATCH] Provide no event_id for the name state event when it comes
 via update_name

Also respond to a couple of minor review comments
---
 crates/matrix-sdk-base/src/rooms/normal.rs | 3 +--
 crates/matrix-sdk-base/src/sliding_sync.rs | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/crates/matrix-sdk-base/src/rooms/normal.rs b/crates/matrix-sdk-base/src/rooms/normal.rs
index 0e19df51a..e0de85980 100644
--- a/crates/matrix-sdk-base/src/rooms/normal.rs
+++ b/crates/matrix-sdk-base/src/rooms/normal.rs
@@ -20,7 +20,6 @@ use std::{
 use futures_util::stream::{self, StreamExt};
 use ruma::{
     api::client::sync::sync_events::v3::RoomSummary as RumaSummary,
-    event_id,
     events::{
         ignored_user_list::IgnoredUserListEventContent,
         receipt::{Receipt, ReceiptThread, ReceiptType},
@@ -725,7 +724,7 @@ impl RoomInfo {
     pub fn update_name(&mut self, name: String) {
         self.base_info.name = Some(MinimalStateEvent::Original(OriginalMinimalStateEvent {
             content: RoomNameEventContent::new(Some(name)),
-            event_id: Some(event_id!("$fake_event_id").to_owned()),
+            event_id: None,
         }));
     }
 
diff --git a/crates/matrix-sdk-base/src/sliding_sync.rs b/crates/matrix-sdk-base/src/sliding_sync.rs
index 39b4bfa6b..4d9753448 100644
--- a/crates/matrix-sdk-base/src/sliding_sync.rs
+++ b/crates/matrix-sdk-base/src/sliding_sync.rs
@@ -276,7 +276,7 @@ impl BaseClient {
 
 #[cfg(test)]
 mod test {
-    use ruma::{device_id, room_id, user_id, RoomId};
+    use ruma::{device_id, room_id, uint, user_id, RoomId};
 
     use super::*;
     use crate::SessionMeta;
@@ -294,10 +294,10 @@ mod test {
         let client = logged_in_client().await;
         let room_id = room_id!("!r:e.uk");
 
-        // When I send sliding sync response containing a room (with idenifiable data in
-        // joined_count)
+        // When I send sliding sync response containing a room (with identifiable data
+        // in joined_count)
         let mut room = v4::SlidingSyncRoom::new();
-        room.joined_count = Some(41.try_into().expect("Failed to make UInt"));
+        room.joined_count = Some(uint!(41));
         let response = response_with_room(room_id, room).await;
         client.process_sliding_sync(&response).await.expect("Failed to process sync");