nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Remove StateStore trait from state-res collect events needed

Browse source
This commit is contained in:
Devin Ragotzy 2021-01-06 08:52:30 -05:00
parent cdeb1236a2
commit 8de0d9f9ce
5 changed files with 163 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/client_server/membership.rs
View file

@ -618,7 +618,6 @@ async fn join_room_by_id_helper(
&room_id,
&control_events,
&mut event_map,
&db.rooms,
&event_ids,
);
@ -629,7 +628,6 @@ async fn join_room_by_id_helper(
&sorted_control_events,
&BTreeMap::new(), // We have no "clean/resolved" events to add (these extend the `resolved_control_events`)
&mut event_map,
&db.rooms,
)
.expect("iterative auth check failed on resolved events");
@ -654,7 +652,6 @@ async fn join_room_by_id_helper(
&events_to_sort,
power_level,
&mut event_map,
&db.rooms,
);
let resolved_events = state_res::StateResolution::iterative_auth_check(
@ -663,7 +660,6 @@ async fn join_room_by_id_helper(
&sorted_event_ids,
&resolved_control_events,
&mut event_map,
&db.rooms,
)
.expect("iterative auth check failed on resolved events");