From 05a4dd1bf0518f4b14192f038fb8b1038271cf14 Mon Sep 17 00:00:00 2001 From: Devin Ragotzy Date: Mon, 28 Dec 2020 17:46:41 -0500 Subject: [PATCH] Convert state-res to use possible ruma::ServerPdu --- Cargo.toml | 10 ----- benches/state_res_bench.rs | 53 +++++++++++++------------- src/event_auth.rs | 24 +++++++----- src/lib.rs | 31 ++++++++------- tests/event_auth.rs | 8 ++-- tests/event_sorting.rs | 10 ++--- tests/res_with_auth_ids.rs | 25 ++++++------- tests/state_res.rs | 46 +++++++++++------------ tests/utils.rs | 77 +++++++++++++++++++------------------- 9 files changed, 141 insertions(+), 143 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 138d6150..08874472 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,16 +26,6 @@ branch = "server-pdu" # rev = "45d01011554f9d07739e9a5edf5498d8ac16f273" features = ["client-api", "federation-api", "appservice-api", "unstable-pre-spec", "unstable-synapse-quirks"] -#[dependencies.ruma] -#path = "../ruma/ruma" -#features = ["client-api", "federation-api", "appservice-api"] - -# [dependencies.ruma] -# git = "https://github.com/timokoesters/ruma" -# branch = "timo-fed-fixes" -# #rev = "aff914050eb297bd82b8aafb12158c88a9e480e1" -# features = ["client-api", "federation-api", "appservice-api"] - [features] default = ["unstable-pre-spec"] gen-eventid = [] diff --git a/benches/state_res_bench.rs b/benches/state_res_bench.rs index ed2f8d47..fd85513c 100644 --- a/benches/state_res_bench.rs +++ b/benches/state_res_bench.rs @@ -10,6 +10,7 @@ use criterion::{criterion_group, criterion_main, Criterion}; use maplit::btreemap; use ruma::{ events::{ + pdu::ServerPdu, room::{ join_rules::JoinRule, member::{MemberEventContent, MembershipState}, @@ -19,7 +20,7 @@ use ruma::{ identifiers::{EventId, RoomId, RoomVersionId, UserId}, }; use serde_json::{json, Value as JsonValue}; -use state_res::{Error, Result, StateEvent, StateMap, StateResolution, StateStore}; +use state_res::{Error, Result, StateMap, StateResolution, StateStore}; static mut SERVER_TIMESTAMP: i32 = 0; @@ -81,7 +82,7 @@ fn resolve_deeper_event_set(c: &mut Criterion) { inner.get(&event_id("PA")).unwrap(), ] .iter() - .map(|ev| ((ev.kind(), ev.state_key()), ev.event_id())) + .map(|ev| ((ev.kind.clone(), ev.state_key.clone()), ev.event_id.clone())) .collect::>(); let state_set_b = [ @@ -94,7 +95,7 @@ fn resolve_deeper_event_set(c: &mut Criterion) { inner.get(&event_id("PA")).unwrap(), ] .iter() - .map(|ev| ((ev.kind(), ev.state_key()), ev.event_id())) + .map(|ev| ((ev.kind.clone(), ev.state_key.clone()), ev.event_id.clone())) .collect::>(); b.iter(|| { @@ -114,7 +115,7 @@ fn resolve_deeper_event_set(c: &mut Criterion) { criterion_group!( benches, - lexico_topo_sort, + // lexico_topo_sort, resolution_shallow_auth_chain, resolve_deeper_event_set ); @@ -126,11 +127,11 @@ criterion_main!(benches); // IMPLEMENTATION DETAILS AHEAD // /////////////////////////////////////////////////////////////////////*/ -pub struct TestStore(BTreeMap>); +pub struct TestStore(BTreeMap>); #[allow(unused)] impl StateStore for TestStore { - fn get_event(&self, room_id: &RoomId, event_id: &EventId) -> Result> { + fn get_event(&self, room_id: &RoomId, event_id: &EventId) -> Result> { self.0 .get(event_id) .map(Arc::clone) @@ -149,7 +150,7 @@ impl TestStore { &[], &[], )); - let cre = create_event.event_id(); + let cre = create_event.event_id.clone(); self.0.insert(cre.clone(), Arc::clone(&create_event)); let alice_mem = to_pdu_event( @@ -161,7 +162,8 @@ impl TestStore { &[cre.clone()], &[cre.clone()], ); - self.0.insert(alice_mem.event_id(), Arc::clone(&alice_mem)); + self.0 + .insert(alice_mem.event_id.clone(), Arc::clone(&alice_mem)); let join_rules = to_pdu_event( "IJR", @@ -169,11 +171,11 @@ impl TestStore { EventType::RoomJoinRules, Some(""), json!({ "join_rule": JoinRule::Public }), - &[cre.clone(), alice_mem.event_id()], - &[alice_mem.event_id()], + &[cre.clone(), alice_mem.event_id.clone()], + &[alice_mem.event_id.clone()], ); self.0 - .insert(join_rules.event_id(), Arc::clone(&join_rules)); + .insert(join_rules.event_id.clone(), Arc::clone(&join_rules)); // Bob and Charlie join at the same time, so there is a fork // this will be represented in the state_sets when we resolve @@ -183,10 +185,11 @@ impl TestStore { EventType::RoomMember, Some(bob().to_string().as_str()), member_content_join(), - &[cre.clone(), join_rules.event_id()], - &[join_rules.event_id()], + &[cre.clone(), join_rules.event_id.clone()], + &[join_rules.event_id.clone()], ); - self.0.insert(bob_mem.event_id(), Arc::clone(&bob_mem)); + self.0 + .insert(bob_mem.event_id.clone(), Arc::clone(&bob_mem)); let charlie_mem = to_pdu_event( "IMC", @@ -194,20 +197,20 @@ impl TestStore { EventType::RoomMember, Some(charlie().to_string().as_str()), member_content_join(), - &[cre, join_rules.event_id()], - &[join_rules.event_id()], + &[cre, join_rules.event_id.clone()], + &[join_rules.event_id.clone()], ); self.0 - .insert(charlie_mem.event_id(), Arc::clone(&charlie_mem)); + .insert(charlie_mem.event_id.clone(), Arc::clone(&charlie_mem)); let state_at_bob = [&create_event, &alice_mem, &join_rules, &bob_mem] .iter() - .map(|e| ((e.kind(), e.state_key()), e.event_id())) + .map(|e| ((e.kind.clone(), e.state_key.clone()), e.event_id.clone())) .collect::>(); let state_at_charlie = [&create_event, &alice_mem, &join_rules, &charlie_mem] .iter() - .map(|e| ((e.kind(), e.state_key()), e.event_id())) + .map(|e| ((e.kind.clone(), e.state_key.clone()), e.event_id.clone())) .collect::>(); let expected = [ @@ -218,7 +221,7 @@ impl TestStore { &charlie_mem, ] .iter() - .map(|e| ((e.kind(), e.state_key()), e.event_id())) + .map(|e| ((e.kind.clone(), e.state_key.clone()), e.event_id.clone())) .collect::>(); (state_at_bob, state_at_charlie, expected) @@ -279,7 +282,7 @@ fn to_pdu_event( content: JsonValue, auth_events: &[S], prev_events: &[S], -) -> Arc +) -> Arc where S: AsRef, { @@ -342,7 +345,7 @@ where // all graphs start with these input events #[allow(non_snake_case)] -fn INITIAL_EVENTS() -> BTreeMap> { +fn INITIAL_EVENTS() -> BTreeMap> { vec![ to_pdu_event::( "CREATE", @@ -418,13 +421,13 @@ fn INITIAL_EVENTS() -> BTreeMap> { ), ] .into_iter() - .map(|ev| (ev.event_id(), ev)) + .map(|ev| (ev.event_id.clone(), ev)) .collect() } // all graphs start with these input events #[allow(non_snake_case)] -fn BAN_STATE_SET() -> BTreeMap> { +fn BAN_STATE_SET() -> BTreeMap> { vec![ to_pdu_event( "PA", @@ -464,6 +467,6 @@ fn BAN_STATE_SET() -> BTreeMap> { ), ] .into_iter() - .map(|ev| (ev.event_id(), ev)) + .map(|ev| (ev.event_id.clone(), ev)) .collect() } diff --git a/src/event_auth.rs b/src/event_auth.rs index bb168c93..05159aea 100644 --- a/src/event_auth.rs +++ b/src/event_auth.rs @@ -25,7 +25,7 @@ pub fn auth_types_for_event( state_key: Option, content: serde_json::Value, ) -> Vec<(EventType, Option)> { - if kind == EventType::RoomCreate { + if kind == &EventType::RoomCreate { return vec![]; } @@ -35,7 +35,7 @@ pub fn auth_types_for_event( (EventType::RoomCreate, Some("".to_string())), ]; - if kind == EventType::RoomMember { + if kind == &EventType::RoomMember { if let Ok(content) = serde_json::from_value::(content) { if [MembershipState::Join, MembershipState::Invite].contains(&content.membership) { let key = (EventType::RoomJoinRules, Some("".into())); @@ -332,7 +332,7 @@ pub fn valid_membership_change( }) }, |power_levels| { - serde_json::from_value::(power_levels.content) + serde_json::from_value::(power_levels.content.clone()) .map_err(Into::into) }, )?; @@ -448,7 +448,7 @@ pub fn check_event_sender_in_room( pub fn can_send_event(event: &Arc, auth_events: &StateMap>) -> bool { let ple = auth_events.get(&(EventType::RoomPowerLevels, Some("".into()))); - let event_type_power_level = get_send_level(event.kind, event.state_key, ple); + let event_type_power_level = get_send_level(&event.kind, event.state_key.clone(), ple); let user_level = get_user_power_level(&event.sender, auth_events); tracing::debug!( @@ -462,7 +462,10 @@ pub fn can_send_event(event: &Arc, auth_events: &StateMap, auth_events: &StateMap>, ) -> Option { - let key = (power_event.kind, power_event.state_key); + let key = (power_event.kind.clone(), power_event.state_key.clone()); let current_state = if let Some(current_state) = auth_events.get(&key) { current_state } else { @@ -644,7 +647,10 @@ pub fn check_redaction( if let RoomVersionId::Version1 = room_version { // If the domain of the event_id of the event being redacted is the same as the domain of the event_id of the m.room.redaction, allow if redaction_event.event_id.server_name() - == redaction_event.redacts.and_then(|id| id.server_name()) + == redaction_event + .redacts + .as_ref() + .and_then(|id| id.server_name()) { tracing::info!("redaction event allowed via room version 1 rules"); return Ok(true); @@ -740,7 +746,7 @@ pub fn get_user_power_level(user_id: &UserId, auth_events: &StateMap, power_lvl: Option<&Arc>, ) -> i64 { @@ -806,7 +812,7 @@ pub fn verify_third_party_invite( // If there is no m.room.third_party_invite event in the current room state // with state_key matching token, reject if let Some(current_tpid) = current_third_party_invite { - if current_tpid.state_key != Some(tp_id.signed.token) { + if current_tpid.state_key.as_ref() != Some(&tp_id.signed.token) { return false; } diff --git a/src/lib.rs b/src/lib.rs index 214e3077..01a7113a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -64,9 +64,12 @@ impl StateResolution { }; let mut auth_events = StateMap::new(); - for key in - event_auth::auth_types_for_event(ev.kind, &ev.sender, ev.state_key, ev.content.clone()) - { + for key in event_auth::auth_types_for_event( + &ev.kind, + &ev.sender, + ev.state_key.clone(), + ev.content.clone(), + ) { if let Some(ev_id) = current_state.get(&key) { if let Some(event) = StateResolution::get_or_load_event(room_id, ev_id, &mut event_map, store) @@ -170,7 +173,7 @@ impl StateResolution { // get only the control events with a state_key: "" or ban/kick event (sender != state_key) let control_events = all_conflicted .iter() - .filter(|id| is_power_event(id, &event_map)) + .filter(|id| is_power_event_id(id, &event_map)) .cloned() .collect::>(); @@ -378,12 +381,12 @@ impl StateResolution { let ev = event_map.get(event_id).unwrap(); let pl = event_to_pl.get(event_id).unwrap(); - tracing::debug!("{:?}", (-*pl, ev.origin_server_ts, ev.event_id)); + tracing::debug!("{:?}", (-*pl, ev.origin_server_ts, &ev.event_id)); // This return value is the key used for sorting events, // events are then sorted by power level, time, // and lexically by event_id. - (-*pl, ev.origin_server_ts, ev.event_id) + (-*pl, ev.origin_server_ts, ev.event_id.clone()) }) } @@ -476,7 +479,7 @@ impl StateResolution { // event.auth_event_ids does not include its own event id ? for aid in event .as_ref() - .map(|pdu| pdu.auth_events) + .map(|pdu| pdu.auth_events.to_vec()) .unwrap_or_default() { if let Some(aev) = StateResolution::get_or_load_event(room_id, &aid, event_map, store) { @@ -560,9 +563,9 @@ impl StateResolution { } for key in event_auth::auth_types_for_event( - event.kind, + &event.kind, &event.sender, - event.state_key, + event.state_key.clone(), event.content.clone(), ) { if let Some(ev_id) = resolved_state.get(&key) { @@ -801,18 +804,18 @@ impl StateResolution { } } -pub fn is_power_event(event_id: &EventId, event_map: &EventMap>) -> bool { +pub fn is_power_event_id(event_id: &EventId, event_map: &EventMap>) -> bool { match event_map.get(event_id) { - Some(state) => _is_power_event(state), + Some(state) => is_power_event(state), _ => false, } } -pub fn is_type_and_key(&ev: &Arc, ev_type: EventType, state_key: &str) -> bool { +pub fn is_type_and_key(ev: &Arc, ev_type: EventType, state_key: &str) -> bool { ev.kind == ev_type && ev.state_key.as_deref() == Some(state_key) } -fn _is_power_event(&event: &Arc) -> bool { +pub fn is_power_event(event: &Arc) -> bool { use ruma::events::room::member::{MemberEventContent, MembershipState}; match event.kind { EventType::RoomPowerLevels | EventType::RoomJoinRules | EventType::RoomCreate => { @@ -838,7 +841,7 @@ fn _is_power_event(&event: &Arc) -> bool { pub fn to_requester(event: &Arc) -> Requester<'_> { Requester { - prev_event_ids: event.prev_events, + prev_event_ids: event.prev_events.to_vec(), room_id: &event.room_id, content: &event.content, state_key: event.state_key.clone(), diff --git a/tests/event_auth.rs b/tests/event_auth.rs index be5689da..7fa976ad 100644 --- a/tests/event_auth.rs +++ b/tests/event_auth.rs @@ -18,12 +18,12 @@ fn test_ban_pass() { let prev = events .values() - .find(|ev| ev.event_id().as_str().contains("IMC")) + .find(|ev| ev.event_id.as_str().contains("IMC")) .map(Arc::clone); let auth_events = events .values() - .map(|ev| ((ev.kind(), ev.state_key()), Arc::clone(ev))) + .map(|ev| ((ev.kind.clone(), ev.state_key.clone()), Arc::clone(ev))) .collect::>(); let requester = Requester { @@ -43,12 +43,12 @@ fn test_ban_fail() { let prev = events .values() - .find(|ev| ev.event_id().as_str().contains("IMC")) + .find(|ev| ev.event_id.as_str().contains("IMC")) .map(Arc::clone); let auth_events = events .values() - .map(|ev| ((ev.kind(), ev.state_key()), Arc::clone(ev))) + .map(|ev| ((ev.kind.clone(), ev.state_key.clone()), Arc::clone(ev))) .collect::>(); let requester = Requester { diff --git a/tests/event_sorting.rs b/tests/event_sorting.rs index 6c49a153..02d74b3a 100644 --- a/tests/event_sorting.rs +++ b/tests/event_sorting.rs @@ -4,7 +4,7 @@ use ruma::{ events::EventType, identifiers::{EventId, RoomVersionId}, }; -use state_res::StateMap; +use state_res::{is_power_event, StateMap}; mod utils; use utils::{room_id, TestStore, INITIAL_EVENTS}; @@ -25,15 +25,15 @@ fn test_event_sort() { let event_map = events .values() - .map(|ev| ((ev.kind(), ev.state_key()), ev.clone())) + .map(|ev| ((ev.kind.clone(), ev.state_key.clone()), ev.clone())) .collect::>(); let auth_chain = &[] as &[_]; let power_events = event_map .values() - .filter(|pdu| pdu.is_power_event()) - .map(|pdu| pdu.event_id()) + .filter(|pdu| is_power_event(&pdu)) + .map(|pdu| pdu.event_id.clone()) .collect::>(); // This is a TODO in conduit @@ -64,7 +64,7 @@ fn test_event_sort() { shuffle(&mut events_to_sort); - let power_level = resolved_power.get(&(EventType::RoomPowerLevels, "".into())); + let power_level = resolved_power.get(&(EventType::RoomPowerLevels, Some("".to_string()))); let sorted_event_ids = state_res::StateResolution::mainline_sort( &room_id(), diff --git a/tests/res_with_auth_ids.rs b/tests/res_with_auth_ids.rs index eabb201b..68a72837 100644 --- a/tests/res_with_auth_ids.rs +++ b/tests/res_with_auth_ids.rs @@ -3,11 +3,11 @@ use std::{collections::BTreeMap, sync::Arc}; use ruma::{ - events::EventType, + events::{pdu::ServerPdu, EventType}, identifiers::{EventId, RoomVersionId}, }; use serde_json::json; -use state_res::{StateEvent, StateMap, StateResolution}; +use state_res::{StateMap, StateResolution}; mod utils; use utils::{ @@ -24,7 +24,7 @@ fn ban_with_auth_chains() { .map(|list| list.into_iter().map(event_id).collect::>()) .collect::>(); - let expected_state_ids = vec!["PA", "MB", "END"] + let expected_state_ids = vec!["PA", "MB"] .into_iter() .map(event_id) .collect::>(); @@ -50,7 +50,7 @@ fn base_with_auth_chains() { let resolved = resolved .values() .cloned() - .chain(INITIAL_EVENTS().values().map(|e| e.event_id())) + .chain(INITIAL_EVENTS().values().map(|e| e.event_id.clone())) .collect::>(); let expected = vec![ @@ -89,7 +89,7 @@ fn ban_with_auth_chains2() { inner.get(&event_id("PA")).unwrap(), ] .iter() - .map(|ev| ((ev.kind(), ev.state_key()), ev.event_id())) + .map(|ev| ((ev.kind.clone(), ev.state_key.clone()), ev.event_id.clone())) .collect::>(); let state_set_b = [ @@ -102,7 +102,7 @@ fn ban_with_auth_chains2() { inner.get(&event_id("PA")).unwrap(), ] .iter() - .map(|ev| ((ev.kind(), ev.state_key()), ev.event_id())) + .map(|ev| ((ev.kind.clone(), ev.state_key.clone()), ev.event_id.clone())) .collect::>(); let resolved: StateMap = match StateResolution::resolve( @@ -154,10 +154,7 @@ fn join_rule_with_auth_chain() { .map(|list| list.into_iter().map(event_id).collect::>()) .collect::>(); - let expected_state_ids = vec!["JR", "END"] - .into_iter() - .map(event_id) - .collect::>(); + let expected_state_ids = vec!["JR"].into_iter().map(event_id).collect::>(); do_check( &join_rule.values().cloned().collect::>(), @@ -167,7 +164,7 @@ fn join_rule_with_auth_chain() { } #[allow(non_snake_case)] -fn BAN_STATE_SET() -> BTreeMap> { +fn BAN_STATE_SET() -> BTreeMap> { vec![ to_pdu_event( "PA", @@ -207,12 +204,12 @@ fn BAN_STATE_SET() -> BTreeMap> { ), ] .into_iter() - .map(|ev| (ev.event_id(), ev)) + .map(|ev| (ev.event_id.clone(), ev)) .collect() } #[allow(non_snake_case)] -fn JOIN_RULE() -> BTreeMap> { +fn JOIN_RULE() -> BTreeMap> { vec![ to_pdu_event( "JR", @@ -234,6 +231,6 @@ fn JOIN_RULE() -> BTreeMap> { ), ] .into_iter() - .map(|ev| (ev.event_id(), ev)) + .map(|ev| (ev.event_id.clone(), ev)) .collect() } diff --git a/tests/state_res.rs b/tests/state_res.rs index f7c69fe2..4017ee0d 100644 --- a/tests/state_res.rs +++ b/tests/state_res.rs @@ -56,7 +56,7 @@ fn ban_vs_power_level() { .map(|list| list.into_iter().map(event_id).collect::>()) .collect::>(); - let expected_state_ids = vec!["PA", "MA", "MB", "END"] + let expected_state_ids = vec!["PA", "MA", "MB"] .into_iter() .map(event_id) .collect::>(); @@ -101,7 +101,7 @@ fn topic_basic() { .map(|list| list.into_iter().map(event_id).collect::>()) .collect::>(); - let expected_state_ids = vec!["PA2", "T2", "END"] + let expected_state_ids = vec!["PA2", "T2"] .into_iter() .map(event_id) .collect::>(); @@ -138,7 +138,7 @@ fn topic_reset() { .map(|list| list.into_iter().map(event_id).collect::>()) .collect::>(); - let expected_state_ids = vec!["T1", "MB", "PA", "END"] + let expected_state_ids = vec!["T1", "MB", "PA"] .into_iter() .map(event_id) .collect::>(); @@ -170,7 +170,7 @@ fn join_rule_evasion() { .map(|list| list.into_iter().map(event_id).collect::>()) .collect::>(); - let expected_state_ids = vec![event_id("JR"), event_id("END")]; + let expected_state_ids = vec![event_id("JR")]; do_check(events, edges, expected_state_ids) } @@ -206,10 +206,7 @@ fn offtopic_power_level() { .map(|list| list.into_iter().map(event_id).collect::>()) .collect::>(); - let expected_state_ids = vec!["PC", "END"] - .into_iter() - .map(event_id) - .collect::>(); + let expected_state_ids = vec!["PC"].into_iter().map(event_id).collect::>(); do_check(events, edges, expected_state_ids) } @@ -253,7 +250,7 @@ fn topic_setting() { .map(|list| list.into_iter().map(event_id).collect::>()) .collect::>(); - let expected_state_ids = vec!["T4", "PA2", "END"] + let expected_state_ids = vec!["T4", "PA2"] .into_iter() .map(event_id) .collect::>(); @@ -324,7 +321,7 @@ impl TestStore { &[], &[], ); - let cre = create_event.event_id(); + let cre = create_event.event_id.clone(); self.0.insert(cre.clone(), Arc::clone(&create_event)); let alice_mem = to_pdu_event( @@ -336,7 +333,8 @@ impl TestStore { &[cre.clone()], &[cre.clone()], ); - self.0.insert(alice_mem.event_id(), Arc::clone(&alice_mem)); + self.0 + .insert(alice_mem.event_id.clone(), Arc::clone(&alice_mem)); let join_rules = to_pdu_event( "IJR", @@ -344,10 +342,11 @@ impl TestStore { EventType::RoomJoinRules, Some(""), json!({ "join_rule": JoinRule::Public }), - &[cre.clone(), alice_mem.event_id()], - &[alice_mem.event_id()], + &[cre.clone(), alice_mem.event_id.clone()], + &[alice_mem.event_id.clone()], ); - self.0.insert(join_rules.event_id(), join_rules.clone()); + self.0 + .insert(join_rules.event_id.clone(), join_rules.clone()); // Bob and Charlie join at the same time, so there is a fork // this will be represented in the state_sets when we resolve @@ -357,10 +356,10 @@ impl TestStore { EventType::RoomMember, Some(bob().to_string().as_str()), member_content_join(), - &[cre.clone(), join_rules.event_id()], - &[join_rules.event_id()], + &[cre.clone(), join_rules.event_id.clone()], + &[join_rules.event_id.clone()], ); - self.0.insert(bob_mem.event_id(), bob_mem.clone()); + self.0.insert(bob_mem.event_id.clone(), bob_mem.clone()); let charlie_mem = to_pdu_event( "IMC", @@ -368,19 +367,20 @@ impl TestStore { EventType::RoomMember, Some(charlie().to_string().as_str()), member_content_join(), - &[cre, join_rules.event_id()], - &[join_rules.event_id()], + &[cre, join_rules.event_id.clone()], + &[join_rules.event_id.clone()], ); - self.0.insert(charlie_mem.event_id(), charlie_mem.clone()); + self.0 + .insert(charlie_mem.event_id.clone(), charlie_mem.clone()); let state_at_bob = [&create_event, &alice_mem, &join_rules, &bob_mem] .iter() - .map(|e| ((e.kind(), e.state_key()), e.event_id())) + .map(|e| ((e.kind.clone(), e.state_key.clone()), e.event_id.clone())) .collect::>(); let state_at_charlie = [&create_event, &alice_mem, &join_rules, &charlie_mem] .iter() - .map(|e| ((e.kind(), e.state_key()), e.event_id())) + .map(|e| ((e.kind.clone(), e.state_key.clone()), e.event_id.clone())) .collect::>(); let expected = [ @@ -391,7 +391,7 @@ impl TestStore { &charlie_mem, ] .iter() - .map(|e| ((e.kind(), e.state_key()), e.event_id())) + .map(|e| ((e.kind.clone(), e.state_key.clone()), e.event_id.clone())) .collect::>(); (state_at_bob, state_at_charlie, expected) diff --git a/tests/utils.rs b/tests/utils.rs index 7eef8a15..3195f70f 100644 --- a/tests/utils.rs +++ b/tests/utils.rs @@ -9,6 +9,7 @@ use std::{ use ruma::{ events::{ + pdu::ServerPdu, room::{ join_rules::JoinRule, member::{MemberEventContent, MembershipState}, @@ -18,7 +19,7 @@ use ruma::{ identifiers::{EventId, RoomId, RoomVersionId, UserId}, }; use serde_json::{json, Value as JsonValue}; -use state_res::{Error, Result, StateEvent, StateMap, StateResolution, StateStore}; +use state_res::{Error, Result, StateMap, StateResolution, StateStore}; use tracing_subscriber as tracer; pub static LOGGER: Once = Once::new(); @@ -26,7 +27,7 @@ pub static LOGGER: Once = Once::new(); static mut SERVER_TIMESTAMP: i32 = 0; pub fn do_check( - events: &[Arc], + events: &[Arc], edges: Vec>, expected_state_ids: Vec, ) { @@ -41,20 +42,20 @@ pub fn do_check( INITIAL_EVENTS() .values() .chain(events) - .map(|ev| (ev.event_id(), ev.clone())) + .map(|ev| (ev.event_id.clone(), ev.clone())) .collect(), ); // This will be lexi_topo_sorted for resolution let mut graph = BTreeMap::new(); - // this is the same as in `resolve` event_id -> StateEvent + // this is the same as in `resolve` event_id -> ServerPdu let mut fake_event_map = BTreeMap::new(); // create the DB of events that led up to this point // TODO maybe clean up some of these clones it is just tests but... for ev in INITIAL_EVENTS().values().chain(events) { - graph.insert(ev.event_id().clone(), vec![]); - fake_event_map.insert(ev.event_id().clone(), ev.clone()); + graph.insert(ev.event_id.clone(), vec![]); + fake_event_map.insert(ev.event_id.clone(), ev.clone()); } for pair in INITIAL_EDGES().windows(2) { @@ -71,10 +72,8 @@ pub fn do_check( } } - panic!("{}", serde_json::to_string_pretty(&graph).unwrap()); - - // event_id -> StateEvent - let mut event_map: BTreeMap> = BTreeMap::new(); + // event_id -> ServerPdu + let mut event_map: BTreeMap> = BTreeMap::new(); // event_id -> StateMap let mut state_at_event: BTreeMap> = BTreeMap::new(); @@ -84,7 +83,7 @@ pub fn do_check( StateResolution::lexicographical_topological_sort(&graph, |id| (0, UNIX_EPOCH, id.clone())) { let fake_event = fake_event_map.get(&node).unwrap(); - let event_id = fake_event.event_id(); + let event_id = fake_event.event_id.clone(); let prev_events = graph.get(&node).unwrap(); @@ -125,17 +124,17 @@ pub fn do_check( let mut state_after = state_before.clone(); - // if fake_event.state_key().is_some() { - let ty = fake_event.kind().clone(); - let key = fake_event.state_key().clone(); - state_after.insert((ty, key), event_id.clone()); - // } + if fake_event.state_key.is_some() { + let ty = fake_event.kind.clone(); + let key = fake_event.state_key.clone(); + state_after.insert((ty, key), event_id.clone()); + } let auth_types = state_res::auth_types_for_event( - fake_event.kind(), - fake_event.sender(), - Some(fake_event.state_key()), - fake_event.content().clone(), + &fake_event.kind, + &fake_event.sender, + fake_event.state_key.clone(), + fake_event.content.clone(), ); let mut auth_events = vec![]; @@ -148,13 +147,13 @@ pub fn do_check( // TODO The event is just remade, adding the auth_events and prev_events here // the `to_pdu_event` was split into `init` and the fn below, could be better let e = fake_event; - let ev_id = e.event_id(); + let ev_id = e.event_id.clone(); let event = to_pdu_event( - &e.event_id().to_string(), - e.sender().clone(), - e.kind(), - Some(e.state_key()).as_deref(), - e.content().clone(), + &e.event_id.clone().to_string(), + e.sender.clone(), + e.kind.clone(), + e.state_key.as_deref(), + e.content.clone(), &auth_events, prev_events, ); @@ -172,11 +171,11 @@ pub fn do_check( // println!( // "res contains: {} passed: {} for {}\n{:?}", // state_after - // .get(&(event.kind(), event.state_key())) + // .get(&(event.kind, event.state_key())) // .map(|id| id == &ev_id) // .unwrap_or_default(), // res, - // event.event_id().as_str(), + // event.event_id.clone().as_str(), // event // .prev_event_ids() // .iter() @@ -206,7 +205,7 @@ pub fn do_check( .collect::>(), )); - let key = (ev.kind(), ev.state_key()); + let key = (ev.kind.clone(), ev.state_key.clone()); expected_state.insert(key, node); } @@ -224,11 +223,11 @@ pub fn do_check( assert_eq!(expected_state, end_state); } -pub struct TestStore(pub BTreeMap>); +pub struct TestStore(pub BTreeMap>); #[allow(unused)] impl StateStore for TestStore { - fn get_event(&self, room_id: &RoomId, event_id: &EventId) -> Result> { + fn get_event(&self, room_id: &RoomId, event_id: &EventId) -> Result> { self.0 .get(event_id) .map(Arc::clone) @@ -291,7 +290,7 @@ pub fn to_init_pdu_event( ev_type: EventType, state_key: Option<&str>, content: JsonValue, -) -> Arc { +) -> Arc { let ts = unsafe { let ts = SERVER_TIMESTAMP; // increment the "origin_server_ts" value @@ -347,7 +346,7 @@ pub fn to_pdu_event( content: JsonValue, auth_events: &[S], prev_events: &[S], -) -> Arc +) -> Arc where S: AsRef, { @@ -410,7 +409,7 @@ where // all graphs start with these input events #[allow(non_snake_case)] -pub fn INITIAL_EVENTS() -> BTreeMap> { +pub fn INITIAL_EVENTS() -> BTreeMap> { // this is always called so we can init the logger here let _ = LOGGER.call_once(|| { tracer::fmt() @@ -476,8 +475,8 @@ pub fn INITIAL_EVENTS() -> BTreeMap> { to_pdu_event::( "START", charlie(), - EventType::RoomTopic, - Some(""), + EventType::RoomMessage, + None, json!({}), &[], &[], @@ -485,15 +484,15 @@ pub fn INITIAL_EVENTS() -> BTreeMap> { to_pdu_event::( "END", charlie(), - EventType::RoomTopic, - Some(""), + EventType::RoomMessage, + None, json!({}), &[], &[], ), ] .into_iter() - .map(|ev| (ev.event_id(), ev)) + .map(|ev| (ev.event_id.clone(), ev)) .collect() }