chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up state_res_bench.rs

Browse Source
This commit is contained in:
Jonas Platte 2021-04-26 17:44:03 +02:00
parent c2988d4b8d
commit a7205c6ae7
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
benches/state_res_bench.rs
View File

@ -487,7 +487,7 @@ pub mod event {
use ruma::{ use ruma::{
events::{ events::{
pdu::{EventHash, Pdu}, pdu::{EventHash, Pdu},
room::member::{MemberEventContent, MembershipState}, room::member::MembershipState,
EventType, EventType,
}, },
EventId, RoomId, RoomVersionId, ServerName, ServerSigningKeyId, UInt, UserId, EventId, RoomId, RoomVersionId, ServerName, ServerSigningKeyId, UInt, UserId,
@ -509,6 +509,7 @@ pub mod event {
fn sender(&self) -> &UserId { fn sender(&self) -> &UserId {
self.sender() self.sender()
} }
fn kind(&self) -> EventType { fn kind(&self) -> EventType {
self.kind() self.kind()
} }
@ -516,6 +517,7 @@ pub mod event {
fn content(&self) -> serde_json::Value { fn content(&self) -> serde_json::Value {
self.content() self.content()
} }
fn origin_server_ts(&self) -> SystemTime { fn origin_server_ts(&self) -> SystemTime {
*self.origin_server_ts() *self.origin_server_ts()
} }
@ -523,24 +525,31 @@ pub mod event {
fn state_key(&self) -> Option<String> { fn state_key(&self) -> Option<String> {
self.state_key() self.state_key()
} }
fn prev_events(&self) -> Vec<EventId> { fn prev_events(&self) -> Vec<EventId> {
self.prev_event_ids() self.prev_event_ids()
} }
fn depth(&self) -> &UInt { fn depth(&self) -> &UInt {
self.depth() self.depth()
} }
fn auth_events(&self) -> Vec<EventId> { fn auth_events(&self) -> Vec<EventId> {
self.auth_events() self.auth_events()
} }
fn redacts(&self) -> Option<&EventId> { fn redacts(&self) -> Option<&EventId> {
self.redacts() self.redacts()
} }
fn hashes(&self) -> &EventHash { fn hashes(&self) -> &EventHash {
self.hashes() self.hashes()
} }
fn signatures(&self) -> BTreeMap<Box<ServerName>, BTreeMap<ServerSigningKeyId, String>> { fn signatures(&self) -> BTreeMap<Box<ServerName>, BTreeMap<ServerSigningKeyId, String>> {
self.signatures() self.signatures()
} }
fn unsigned(&self) -> &BTreeMap<String, JsonValue> { fn unsigned(&self) -> &BTreeMap<String, JsonValue> {
self.unsigned() self.unsigned()
} }
@ -583,25 +592,23 @@ pub mod event {
| EventType::RoomCreate => event.state_key == Some("".into()), | EventType::RoomCreate => event.state_key == Some("".into()),
EventType::RoomMember => { EventType::RoomMember => {
// TODO fix clone // TODO fix clone
if let Ok(content) = if let Ok(membership) = serde_json::from_value::<MembershipState>(
serde_json::from_value::<MemberEventContent>(event.content.clone()) event.content["membership"].clone(),
{ ) {
if [MembershipState::Leave, MembershipState::Ban] [MembershipState::Leave, MembershipState::Ban].contains(&membership)
.contains(&content.membership) && event.sender.as_str()
{ // TODO is None here a failure
return event.sender.as_str() != event.state_key.as_deref().unwrap_or("NOT A STATE KEY")
// TODO is None here a failure } else {
!= event.state_key.as_deref().unwrap_or("NOT A STATE KEY"); false
}
} }
false
} }
_ => false, _ => false,
}, },
Pdu::RoomV3Pdu(event) => event.state_key == Some("".into()), Pdu::RoomV3Pdu(event) => event.state_key == Some("".into()),
} }
} }
pub fn deserialize_content<C: serde::de::DeserializeOwned>( pub fn deserialize_content<C: serde::de::DeserializeOwned>(
&self, &self,
) -> Result<C, serde_json::Error> { ) -> Result<C, serde_json::Error> {
@ -610,12 +617,14 @@ pub mod event {
Pdu::RoomV3Pdu(ev) => serde_json::from_value(ev.content.clone()), Pdu::RoomV3Pdu(ev) => serde_json::from_value(ev.content.clone()),
} }
} }
pub fn origin_server_ts(&self) -> &SystemTime { pub fn origin_server_ts(&self) -> &SystemTime {
match &self.rest { match &self.rest {
Pdu::RoomV1Pdu(ev) => &ev.origin_server_ts, Pdu::RoomV1Pdu(ev) => &ev.origin_server_ts,
Pdu::RoomV3Pdu(ev) => &ev.origin_server_ts, Pdu::RoomV3Pdu(ev) => &ev.origin_server_ts,
} }
} }
pub fn event_id(&self) -> &EventId { pub fn event_id(&self) -> &EventId {
&self.event_id &self.event_id
} }