refactor(event factory): simplify tag() helper

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

@@ -1571,7 +1571,7 @@ mod tests {
         let mut tags = Tags::new();
         tags.insert(TagName::Favorite, TagInfo::new());
         tags.insert(TagName::User(UserTagName::from_str("u.work").unwrap()), TagInfo::new());
-        let raw_tag_event: Raw<AnyRoomAccountDataEvent> = f.tag(tags.into()).into();
+        let raw_tag_event: Raw<AnyRoomAccountDataEvent> = f.tag(tags).into();
         let tag_event = raw_tag_event.deserialize().unwrap();
         changes.add_room_account_data(&room_info.room_id, tag_event, raw_tag_event);
 

crates/matrix-sdk-base/src/store/integration_tests.rs

@@ -155,7 +155,7 @@ impl StateStoreIntegrationTests for DynStateStore {
         let mut tags = Tags::new();
         tags.insert(TagName::Favorite, TagInfo::new());
         tags.insert(TagName::User(UserTagName::from_str("u.work").unwrap()), TagInfo::new());
-        let tag_raw: Raw<AnyRoomAccountDataEvent> = f.tag(tags.into()).into();
+        let tag_raw: Raw<AnyRoomAccountDataEvent> = f.tag(tags).into();
         let tag_event = tag_raw.deserialize()?;
         changes.add_room_account_data(room_id, tag_event, tag_raw);
 

crates/matrix-sdk/tests/integration/client.rs

@@ -1369,7 +1369,7 @@ async fn test_restore_room() {
     let f = EventFactory::new().room(room_id).sender(user_id!("@example:localhost"));
     let mut tags = Tags::new();
     tags.insert(TagName::Favorite, TagInfo::default());
-    let raw_tag_event: Raw<AnyRoomAccountDataEvent> = f.tag(TagEventContent::new(tags)).into();
+    let raw_tag_event: Raw<AnyRoomAccountDataEvent> = f.tag(tags).into();
     let tag_event = raw_tag_event.deserialize().unwrap();
     changes.add_room_account_data(room_id, tag_event, raw_tag_event);
 

crates/matrix-sdk/tests/integration/room/tags.rs

@@ -52,8 +52,7 @@ async fn mock_sync_with_tags(
     tags: Tags,
 ) {
     let f = EventFactory::new();
-    let content = TagEventContent::new(tags);
-    sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_account_data(f.tag(content)));
+    sync_builder.add_joined_room(JoinedRoomBuilder::new(room_id).add_account_data(f.tag(tags)));
     mock_sync(server, sync_builder.build_json_sync_response(), None).await;
 }
 

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

@@ -91,7 +91,7 @@ use ruma::{
         space::{child::SpaceChildEventContent, parent::SpaceParentEventContent},
         space_order::SpaceOrderEventContent,
         sticker::StickerEventContent,
-        tag::TagEventContent,
+        tag::{TagEventContent, Tags},
         typing::TypingEventContent,
     },
     presence::PresenceState,
@@ -1512,8 +1512,8 @@ impl EventFactory {
     }
 
     /// Create a new `m.tag` room account data event with the given tags.
-    pub fn tag(&self, content: TagEventContent) -> EventBuilder<TagEventContent> {
-        self.room_account_data(content)
+    pub fn tag(&self, tags: Tags) -> EventBuilder<TagEventContent> {
+        self.room_account_data(tags.into())
     }
 
     /// Create a new `m.space_order` room account data event with the given