From bc1e7eb1fc80a8f24a0f8ba73bc5ac6afce6cb3e Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sun, 12 Sep 2021 00:42:05 +0200 Subject: [PATCH] state-res: Remove unused code from test_utils --- crates/ruma-state-res/src/test_utils.rs | 134 +----------------------- 1 file changed, 3 insertions(+), 131 deletions(-) diff --git a/crates/ruma-state-res/src/test_utils.rs b/crates/ruma-state-res/src/test_utils.rs index 1a5498f3..8ecea877 100644 --- a/crates/ruma-state-res/src/test_utils.rs +++ b/crates/ruma-state-res/src/test_utils.rs @@ -3,7 +3,7 @@ use std::{ convert::{TryFrom, TryInto}, sync::{ atomic::{AtomicU64, Ordering::SeqCst}, - Arc, Once, + Arc, }, }; @@ -25,8 +25,6 @@ use crate::{auth_types_for_event, Error, Event, Result, StateMap}; pub use event::StateEvent; -pub static LOGGER: Once = Once::new(); - static SERVER_TIMESTAMP: AtomicU64 = AtomicU64::new(0); pub fn do_check( @@ -215,15 +213,6 @@ impl TestStore { .ok_or_else(|| Error::NotFound(format!("{} not found", event_id.to_string()))) } - /// Returns the events that correspond to the `event_ids` sorted in the same order. - pub fn get_events(&self, room_id: &RoomId, event_ids: &[EventId]) -> Result>> { - let mut events = vec![]; - for id in event_ids { - events.push(self.get_event(room_id, id)?); - } - Ok(events) - } - /// Returns a Vec of the related auth events to the given `event`. pub fn auth_event_ids( &self, @@ -249,31 +238,6 @@ impl TestStore { Ok(result) } - - /// Returns a Vec representing the difference in auth chains of the given `events`. - pub fn auth_chain_diff( - &self, - room_id: &RoomId, - event_ids: Vec>, - ) -> Result> { - use itertools::Itertools; - let mut chains = vec![]; - for ids in event_ids { - // TODO state store `auth_event_ids` returns self in the event ids list - // when an event returns `auth_event_ids` self is not contained - let chain = self.auth_event_ids(room_id, &ids)?.into_iter().collect::>(); - chains.push(chain); - } - - if let Some(chain) = chains.first().cloned() { - let rest = chains.iter().skip(1).flatten().cloned().collect(); - let common = chain.intersection(&rest).collect::>(); - - Ok(chains.into_iter().flatten().filter(|id| !common.contains(&id)).dedup().collect()) - } else { - Ok(vec![]) - } - } } // A StateStore implementation for testing @@ -561,13 +525,10 @@ pub mod event { use ruma_events::{ exports::ruma_common::MilliSecondsSinceUnixEpoch, pdu::{EventHash, Pdu}, - room::member::{MemberEventContent, MembershipState}, EventType, }; - use ruma_identifiers::{ - EventId, RoomId, RoomVersionId, ServerName, ServerSigningKeyId, UserId, - }; - use ruma_serde::CanonicalJsonObject; + use ruma_identifiers::{EventId, RoomId, ServerName, ServerSigningKeyId, UserId}; + use serde::{Deserialize, Serialize}; use serde_json::Value as JsonValue; @@ -631,58 +592,6 @@ pub mod event { } impl StateEvent { - pub fn from_id_value(id: EventId, json: serde_json::Value) -> serde_json::Result { - Ok(Self { event_id: id, rest: Pdu::RoomV3Pdu(serde_json::from_value(json)?) }) - } - - pub fn from_id_canon_obj( - id: EventId, - json: CanonicalJsonObject, - ) -> serde_json::Result { - Ok(Self { - event_id: id, - // TODO: this is unfortunate (from_value(to_value(json)))... - rest: Pdu::RoomV3Pdu(serde_json::from_value(serde_json::to_value(json)?)?), - }) - } - - pub fn is_power_event(&self) -> bool { - match &self.rest { - Pdu::RoomV1Pdu(event) => match event.kind { - EventType::RoomPowerLevels - | EventType::RoomJoinRules - | EventType::RoomCreate => event.state_key == Some("".into()), - EventType::RoomMember => { - // TODO fix clone - if let Ok(content) = - serde_json::from_value::(event.content.clone()) - { - if [MembershipState::Leave, MembershipState::Ban] - .contains(&content.membership) - { - return event.sender.as_str() - // TODO is None here a failure - != event.state_key.as_deref().unwrap_or("NOT A STATE KEY"); - } - } - - false - } - _ => false, - }, - Pdu::RoomV3Pdu(event) => event.state_key == Some("".into()), - #[cfg(not(feature = "unstable-exhaustive-types"))] - _ => unreachable!("new PDU version"), - } - } - pub fn deserialize_content(&self) -> serde_json::Result { - match &self.rest { - Pdu::RoomV1Pdu(ev) => serde_json::from_value(ev.content.clone()), - Pdu::RoomV3Pdu(ev) => serde_json::from_value(ev.content.clone()), - #[cfg(not(feature = "unstable-exhaustive-types"))] - _ => unreachable!("new PDU version"), - } - } pub fn origin_server_ts(&self) -> &MilliSecondsSinceUnixEpoch { match &self.rest { Pdu::RoomV1Pdu(ev) => &ev.origin_server_ts, @@ -738,16 +647,6 @@ pub mod event { } } - #[cfg(not(feature = "unstable-pre-spec"))] - pub fn origin(&self) -> String { - match &self.rest { - Pdu::RoomV1Pdu(ev) => ev.origin.clone(), - Pdu::RoomV3Pdu(ev) => ev.origin.clone(), - #[cfg(not(feature = "unstable-exhaustive-types"))] - _ => unreachable!("new PDU version"), - } - } - pub fn prev_event_ids(&self) -> Box + '_> { match &self.rest { Pdu::RoomV1Pdu(ev) => Box::new(ev.prev_events.iter().map(|(id, _)| id)), @@ -812,32 +711,5 @@ pub mod event { _ => unreachable!("new PDU version"), } } - - pub fn is_type_and_key(&self, ev_type: EventType, state_key: &str) -> bool { - match &self.rest { - Pdu::RoomV1Pdu(ev) => { - ev.kind == ev_type && ev.state_key.as_deref() == Some(state_key) - } - Pdu::RoomV3Pdu(ev) => { - ev.kind == ev_type && ev.state_key.as_deref() == Some(state_key) - } - #[cfg(not(feature = "unstable-exhaustive-types"))] - _ => unreachable!("new PDU version"), - } - } - - /// Returns the room version this event is formatted for. - /// - /// Currently either version 1 or 6 is returned, 6 represents - /// version 3 and above. - pub fn room_version(&self) -> RoomVersionId { - // TODO: We have to know the actual room version this is not sufficient - match self.rest { - Pdu::RoomV1Pdu(_) => RoomVersionId::Version1, - Pdu::RoomV3Pdu(_) => RoomVersionId::Version6, - #[cfg(not(feature = "unstable-exhaustive-types"))] - _ => unreachable!("new PDU version"), - } - } } }