bump ruma for async state-res optimizations

Signed-off-by: Jason Volk <[email protected]>
girlbossceo · Dec 4, 2024 · 513236b · 513236b
1 parent 9db0325
commit 513236b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -334,7 +334,7 @@ version = "0.1.2"
 [workspace.dependencies.ruma]
 git = "https://github.com/girlbossceo/ruwuma"
 #branch = "conduwuit-changes"
-rev = "97e2fb6df13f65532d33fc2f0f097ad5a449dd70"
+rev = "1a550585bf025cce48ef8b734339245092bc986e"
 features = [
     "compat",
     "rand",

diff --git a/src/service/rooms/event_handler/resolve_state.rs b/src/service/rooms/event_handler/resolve_state.rs
@@ -65,7 +65,6 @@ pub async fn resolve_state(
 				.collect()
 		})
 		.collect()
-		.boxed()
 		.await;
 
 	debug!("Resolving state");
@@ -74,6 +73,7 @@ pub async fn resolve_state(
 	let event_fetch = |event_id| self.event_fetch(event_id);
 	let event_exists = |event_id| self.event_exists(event_id);
 	let state = state_res::resolve(room_version_id, &fork_states, &auth_chain_sets, &event_fetch, &event_exists)
+		.boxed()
 		.await
 		.map_err(|e| err!(Database(error!("State resolution failed: {e:?}"))))?;
 

diff --git a/src/service/rooms/event_handler/state_at_incoming.rs b/src/service/rooms/event_handler/state_at_incoming.rs
@@ -153,6 +153,7 @@ pub(super) async fn state_at_incoming_resolved(
 	let event_fetch = |event_id| self.event_fetch(event_id);
 	let event_exists = |event_id| self.event_exists(event_id);
 	let result = state_res::resolve(room_version_id, &fork_states, &auth_chain_sets, &event_fetch, &event_exists)
+		.boxed()
 		.await
 		.map_err(|e| err!(Database(warn!(?e, "State resolution on prev events failed."))));