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

state-res: Refactor iterative_auth_check

Browse Source
This commit is contained in:
Jonas Platte 2021-09-05 19:32:46 +02:00
parent 1e19de9579
commit 0ed0a620a3
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,7 @@ where
let room_version = RoomVersion::new(room_version)?; let room_version = RoomVersion::new(room_version)?;
// Sequentially auth check each control event. // Sequentially auth check each control event.
let resolved_control = let resolved_control =
iterative_auth_check(&room_version, &sorted_control_levels, &clean, &fetch_event)?; iterative_auth_check(&room_version, &sorted_control_levels, clean.clone(), &fetch_event)?;
debug!("resolved control events: {}", resolved_control.len()); debug!("resolved control events: {}", resolved_control.len());
trace!("{:?}", resolved_control); trace!("{:?}", resolved_control);
@ -149,7 +149,7 @@ where
let mut resolved_state = iterative_auth_check( let mut resolved_state = iterative_auth_check(
&room_version, &room_version,
&sorted_left_events, &sorted_left_events,
&resolved_control, // The control events are added to the final resolved state resolved_control, // The control events are added to the final resolved state
&fetch_event, &fetch_event,
)?; )?;
@ -381,7 +381,7 @@ where
pub fn iterative_auth_check<E, F>( pub fn iterative_auth_check<E, F>(
room_version: &RoomVersion, room_version: &RoomVersion,
events_to_check: &[EventId], events_to_check: &[EventId],
unconflicted_state: &StateMap<EventId>, unconflicted_state: StateMap<EventId>,
fetch_event: F, fetch_event: F,
) -> Result<StateMap<EventId>> ) -> Result<StateMap<EventId>>
where where
@ -390,11 +390,11 @@ where
{ {
info!("starting iterative auth check"); info!("starting iterative auth check");
debug!("performing auth checks on {:?}", events_to_check.iter().collect::<Vec<_>>()); debug!("performing auth checks on {:?}", events_to_check);
let mut resolved_state = unconflicted_state.clone(); let mut resolved_state = unconflicted_state;
for event_id in events_to_check.iter() { for event_id in events_to_check {
let event = fetch_event(event_id) let event = fetch_event(event_id)
.ok_or_else(|| Error::NotFound(format!("Failed to find {}", event_id)))?; .ok_or_else(|| Error::NotFound(format!("Failed to find {}", event_id)))?;
let state_key = event let state_key = event

2
crates/ruma-state-res/tests/event_sorting.rs
View File

@ -36,7 +36,7 @@ fn test_event_sort() {
let resolved_power = state_res::iterative_auth_check( let resolved_power = state_res::iterative_auth_check(
&RoomVersion::version_6(), &RoomVersion::version_6(),
&sorted_power_events, &sorted_power_events,
&HashMap::new(), // unconflicted events HashMap::new(), // unconflicted events
|id| events.get(id).map(Arc::clone), |id| events.get(id).map(Arc::clone),
) )
.expect("iterative auth check failed on resolved events"); .expect("iterative auth check failed on resolved events");