From 404dd3949fbf9aa3f702e43b9cdf7c8d25d90722 Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <benjamin@bouvier.cc>
Date: Mon, 24 Mar 2025 16:33:08 +0100
Subject: [PATCH] test: remove unused helpers

---
 testing/matrix-sdk-test/src/lib.rs            |  6 +++---
 .../src/sync_builder/joined_room.rs           | 19 ++---------------
 .../matrix-sdk-test/src/sync_builder/mod.rs   |  4 ++--
 .../src/sync_builder/test_event.rs            | 21 +------------------
 4 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/testing/matrix-sdk-test/src/lib.rs b/testing/matrix-sdk-test/src/lib.rs
index 87e52335c..59e161740 100644
--- a/testing/matrix-sdk-test/src/lib.rs
+++ b/testing/matrix-sdk-test/src/lib.rs
@@ -120,9 +120,9 @@ mod sync_builder;
 pub mod test_json;
 
 pub use self::sync_builder::{
-    bulk_room_members, EphemeralTestEvent, GlobalAccountDataTestEvent, InvitedRoomBuilder,
-    JoinedRoomBuilder, KnockedRoomBuilder, LeftRoomBuilder, PresenceTestEvent,
-    RoomAccountDataTestEvent, StateTestEvent, StrippedStateTestEvent, SyncResponseBuilder,
+    bulk_room_members, GlobalAccountDataTestEvent, InvitedRoomBuilder, JoinedRoomBuilder,
+    KnockedRoomBuilder, LeftRoomBuilder, PresenceTestEvent, RoomAccountDataTestEvent,
+    StateTestEvent, StrippedStateTestEvent, SyncResponseBuilder,
 };
 
 pub static ALICE: Lazy<&UserId> = Lazy::new(|| user_id!("@alice:server.name"));
diff --git a/testing/matrix-sdk-test/src/sync_builder/joined_room.rs b/testing/matrix-sdk-test/src/sync_builder/joined_room.rs
index 475758e18..74b223edb 100644
--- a/testing/matrix-sdk-test/src/sync_builder/joined_room.rs
+++ b/testing/matrix-sdk-test/src/sync_builder/joined_room.rs
@@ -2,14 +2,14 @@ use ruma::{
     api::client::sync::sync_events::v3::JoinedRoom,
     events::{
         receipt::ReceiptEventContent, typing::TypingEventContent, AnyRoomAccountDataEvent,
-        AnySyncEphemeralRoomEvent, AnySyncStateEvent, AnySyncTimelineEvent,
+        AnySyncStateEvent, AnySyncTimelineEvent,
     },
     serde::Raw,
     OwnedRoomId, RoomId,
 };
 use serde_json::{from_value as from_json_value, Value as JsonValue};
 
-use super::{EphemeralTestEvent, RoomAccountDataTestEvent, StateTestEvent};
+use super::{RoomAccountDataTestEvent, StateTestEvent};
 use crate::{event_factory::EventBuilder, DEFAULT_TEST_ROOM_ID};
 
 pub struct JoinedRoomBuilder {
@@ -88,21 +88,6 @@ impl JoinedRoomBuilder {
         self
     }
 
-    /// Add an ephemeral event.
-    pub fn add_ephemeral_event(mut self, event: EphemeralTestEvent) -> Self {
-        self.inner.ephemeral.events.push(event.into_raw_event());
-        self
-    }
-
-    /// Add ephemeral events in bulk.
-    pub fn add_ephemeral_bulk<I>(mut self, events: I) -> Self
-    where
-        I: IntoIterator<Item = Raw<AnySyncEphemeralRoomEvent>>,
-    {
-        self.inner.ephemeral.events.extend(events);
-        self
-    }
-
     /// Add a single read receipt to the joined room's ephemeral events.
     pub fn add_receipt(mut self, f: EventBuilder<ReceiptEventContent>) -> Self {
         self.inner.ephemeral.events.push(f.into_raw());
diff --git a/testing/matrix-sdk-test/src/sync_builder/mod.rs b/testing/matrix-sdk-test/src/sync_builder/mod.rs
index 919fe6356..4bfc540ec 100644
--- a/testing/matrix-sdk-test/src/sync_builder/mod.rs
+++ b/testing/matrix-sdk-test/src/sync_builder/mod.rs
@@ -29,8 +29,8 @@ pub use joined_room::JoinedRoomBuilder;
 pub use knocked_room::KnockedRoomBuilder;
 pub use left_room::LeftRoomBuilder;
 pub use test_event::{
-    EphemeralTestEvent, GlobalAccountDataTestEvent, PresenceTestEvent, RoomAccountDataTestEvent,
-    StateTestEvent, StrippedStateTestEvent,
+    GlobalAccountDataTestEvent, PresenceTestEvent, RoomAccountDataTestEvent, StateTestEvent,
+    StrippedStateTestEvent,
 };
 
 /// The `SyncResponseBuilder` struct can be used to easily generate valid sync
diff --git a/testing/matrix-sdk-test/src/sync_builder/test_event.rs b/testing/matrix-sdk-test/src/sync_builder/test_event.rs
index c8b89a596..9ce104317 100644
--- a/testing/matrix-sdk-test/src/sync_builder/test_event.rs
+++ b/testing/matrix-sdk-test/src/sync_builder/test_event.rs
@@ -1,7 +1,7 @@
 use ruma::{
     events::{
         presence::PresenceEvent, AnyGlobalAccountDataEvent, AnyRoomAccountDataEvent,
-        AnyStrippedStateEvent, AnySyncEphemeralRoomEvent, AnySyncStateEvent,
+        AnyStrippedStateEvent, AnySyncStateEvent,
     },
     serde::Raw,
 };
@@ -112,25 +112,6 @@ impl RoomAccountDataTestEvent {
     }
 }
 
-/// Test events that can be added to the ephemeral events.
-pub enum EphemeralTestEvent {
-    Custom(JsonValue),
-}
-
-impl EphemeralTestEvent {
-    /// Get the JSON representation of this test event.
-    pub fn into_json_value(self) -> JsonValue {
-        match self {
-            Self::Custom(json) => json,
-        }
-    }
-
-    /// Get the typed JSON representation of this test event.
-    pub fn into_raw_event(self) -> Raw<AnySyncEphemeralRoomEvent> {
-        from_json_value(self.into_json_value()).unwrap()
-    }
-}
-
 /// Test events that can be added to the presence events.
 pub enum PresenceTestEvent {
     Presence,