From 0ed0a620a395ce9aa5e2f3225bfa35b2b69bd403 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Sun, 5 Sep 2021 19:32:46 +0200
Subject: [PATCH] state-res: Refactor iterative_auth_check

---
 crates/ruma-state-res/src/lib.rs             | 12 ++++++------
 crates/ruma-state-res/tests/event_sorting.rs |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/ruma-state-res/src/lib.rs b/crates/ruma-state-res/src/lib.rs
index 69cdb553..63282ea6 100644
--- a/crates/ruma-state-res/src/lib.rs
+++ b/crates/ruma-state-res/src/lib.rs
@@ -117,7 +117,7 @@ where
     let room_version = RoomVersion::new(room_version)?;
     // Sequentially auth check each control event.
     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());
     trace!("{:?}", resolved_control);
@@ -149,7 +149,7 @@ where
     let mut resolved_state = iterative_auth_check(
         &room_version,
         &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,
     )?;
 
@@ -381,7 +381,7 @@ where
 pub fn iterative_auth_check<E, F>(
     room_version: &RoomVersion,
     events_to_check: &[EventId],
-    unconflicted_state: &StateMap<EventId>,
+    unconflicted_state: StateMap<EventId>,
     fetch_event: F,
 ) -> Result<StateMap<EventId>>
 where
@@ -390,11 +390,11 @@ where
 {
     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)
             .ok_or_else(|| Error::NotFound(format!("Failed to find {}", event_id)))?;
         let state_key = event
diff --git a/crates/ruma-state-res/tests/event_sorting.rs b/crates/ruma-state-res/tests/event_sorting.rs
index 997ce3e0..6077da18 100644
--- a/crates/ruma-state-res/tests/event_sorting.rs
+++ b/crates/ruma-state-res/tests/event_sorting.rs
@@ -36,7 +36,7 @@ fn test_event_sort() {
     let resolved_power = state_res::iterative_auth_check(
         &RoomVersion::version_6(),
         &sorted_power_events,
-        &HashMap::new(), // unconflicted events
+        HashMap::new(), // unconflicted events
         |id| events.get(id).map(Arc::clone),
     )
     .expect("iterative auth check failed on resolved events");