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

state-res: Remove EventMap type alias

Browse Source
This commit is contained in:
Jonas Platte 2021-11-27 22:41:35 +01:00
parent 399bd7d82d
commit a9c12f0909
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/ruma-state-res/src/lib.rs
View File

@ -30,9 +30,6 @@ pub use state_event::Event;
/// A mapping of event type and state_key to some value `T`, usually an `EventId`. /// A mapping of event type and state_key to some value `T`, usually an `EventId`.
pub type StateMap<T> = HashMap<(EventType, String), T>; pub type StateMap<T> = HashMap<(EventType, String), T>;
/// A mapping of `EventId` to `T`, usually a `ServerPdu`.
type EventMap<T> = HashMap<Box<EventId>, T>;
/// Resolve sets of state events as they come in. /// Resolve sets of state events as they come in.
/// ///
/// Internally `StateResolution` builds a graph and an auth chain to allow for state conflict /// Internally `StateResolution` builds a graph and an auth chain to allow for state conflict
@ -558,7 +555,7 @@ fn mainline_sort<E: Event>(
/// associated mainline depth. /// associated mainline depth.
fn get_mainline_depth<E: Event>( fn get_mainline_depth<E: Event>(
mut event: Option<E>, mut event: Option<E>,
mainline_map: &EventMap<usize>, mainline_map: &HashMap<Box<EventId>, usize>,
fetch_event: impl Fn(&EventId) -> Option<E>, fetch_event: impl Fn(&EventId) -> Option<E>,
) -> Result<usize> { ) -> Result<usize> {
while let Some(sort_ev) = event { while let Some(sort_ev) = event {
@ -660,7 +657,7 @@ mod tests {
alice, bob, charlie, do_check, ella, event_id, member_content_ban, member_content_join, alice, bob, charlie, do_check, ella, event_id, member_content_ban, member_content_join,
room_id, to_init_pdu_event, to_pdu_event, zara, StateEvent, TestStore, INITIAL_EVENTS, room_id, to_init_pdu_event, to_pdu_event, zara, StateEvent, TestStore, INITIAL_EVENTS,
}, },
Event, EventMap, StateMap, Event, StateMap,
}; };
fn test_event_sort() { fn test_event_sort() {
@ -1049,7 +1046,7 @@ mod tests {
// build up the DAG // build up the DAG
let (state_at_bob, state_at_charlie, expected) = store.set_up(); let (state_at_bob, state_at_charlie, expected) = store.set_up();
let ev_map: EventMap<Arc<StateEvent>> = store.0.clone(); let ev_map = store.0.clone();
let state_sets = [state_at_bob, state_at_charlie]; let state_sets = [state_at_bob, state_at_charlie];
let resolved = match crate::resolve( let resolved = match crate::resolve(
&RoomVersionId::V2, &RoomVersionId::V2,
@ -1153,7 +1150,7 @@ mod tests {
}) })
.collect::<StateMap<_>>(); .collect::<StateMap<_>>();
let ev_map: EventMap<Arc<StateEvent>> = store.0.clone(); let ev_map = store.0.clone();
let state_sets = [state_set_a, state_set_b]; let state_sets = [state_set_a, state_set_b];
let resolved = match crate::resolve( let resolved = match crate::resolve(
&RoomVersionId::V6, &RoomVersionId::V6,