magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump ruma for async state-res optimizations

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-12-04 00:00:00 +00:00
parent 9db0325b42
commit 513236b3ce
4 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Cargo.lock generated
View file

@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo. # This file is automatically @generated by Cargo.
# It is not intended for manual editing. # It is not intended for manual editing.
version = 3 version = 4
[[package]] [[package]]
name = "addr2line" name = "addr2line"
@ -3171,7 +3171,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma" name = "ruma"
version = "0.10.1" version = "0.10.1"
source = "git+https://github.com/girlbossceo/ruwuma?rev=97e2fb6df13f65532d33fc2f0f097ad5a449dd70#97e2fb6df13f65532d33fc2f0f097ad5a449dd70" source = "git+https://github.com/girlbossceo/ruwuma?rev=1a550585bf025cce48ef8b734339245092bc986e#1a550585bf025cce48ef8b734339245092bc986e"
dependencies = [ dependencies = [
"assign", "assign",
"js_int", "js_int",
@ -3193,7 +3193,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-appservice-api" name = "ruma-appservice-api"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=97e2fb6df13f65532d33fc2f0f097ad5a449dd70#97e2fb6df13f65532d33fc2f0f097ad5a449dd70" source = "git+https://github.com/girlbossceo/ruwuma?rev=1a550585bf025cce48ef8b734339245092bc986e#1a550585bf025cce48ef8b734339245092bc986e"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -3205,7 +3205,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-client-api" name = "ruma-client-api"
version = "0.18.0" version = "0.18.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=97e2fb6df13f65532d33fc2f0f097ad5a449dd70#97e2fb6df13f65532d33fc2f0f097ad5a449dd70" source = "git+https://github.com/girlbossceo/ruwuma?rev=1a550585bf025cce48ef8b734339245092bc986e#1a550585bf025cce48ef8b734339245092bc986e"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"assign", "assign",
@ -3228,7 +3228,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-common" name = "ruma-common"
version = "0.13.0" version = "0.13.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=97e2fb6df13f65532d33fc2f0f097ad5a449dd70#97e2fb6df13f65532d33fc2f0f097ad5a449dd70" source = "git+https://github.com/girlbossceo/ruwuma?rev=1a550585bf025cce48ef8b734339245092bc986e#1a550585bf025cce48ef8b734339245092bc986e"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"base64 0.22.1", "base64 0.22.1",
@ -3258,7 +3258,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-events" name = "ruma-events"
version = "0.28.1" version = "0.28.1"
source = "git+https://github.com/girlbossceo/ruwuma?rev=97e2fb6df13f65532d33fc2f0f097ad5a449dd70#97e2fb6df13f65532d33fc2f0f097ad5a449dd70" source = "git+https://github.com/girlbossceo/ruwuma?rev=1a550585bf025cce48ef8b734339245092bc986e#1a550585bf025cce48ef8b734339245092bc986e"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"indexmap 2.6.0", "indexmap 2.6.0",
@ -3282,7 +3282,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-federation-api" name = "ruma-federation-api"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=97e2fb6df13f65532d33fc2f0f097ad5a449dd70#97e2fb6df13f65532d33fc2f0f097ad5a449dd70" source = "git+https://github.com/girlbossceo/ruwuma?rev=1a550585bf025cce48ef8b734339245092bc986e#1a550585bf025cce48ef8b734339245092bc986e"
dependencies = [ dependencies = [
"bytes", "bytes",
"http", "http",
@ -3300,7 +3300,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identifiers-validation" name = "ruma-identifiers-validation"
version = "0.9.5" version = "0.9.5"
source = "git+https://github.com/girlbossceo/ruwuma?rev=97e2fb6df13f65532d33fc2f0f097ad5a449dd70#97e2fb6df13f65532d33fc2f0f097ad5a449dd70" source = "git+https://github.com/girlbossceo/ruwuma?rev=1a550585bf025cce48ef8b734339245092bc986e#1a550585bf025cce48ef8b734339245092bc986e"
dependencies = [ dependencies = [
"js_int", "js_int",
"thiserror 2.0.3", "thiserror 2.0.3",
@ -3309,7 +3309,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identity-service-api" name = "ruma-identity-service-api"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=97e2fb6df13f65532d33fc2f0f097ad5a449dd70#97e2fb6df13f65532d33fc2f0f097ad5a449dd70" source = "git+https://github.com/girlbossceo/ruwuma?rev=1a550585bf025cce48ef8b734339245092bc986e#1a550585bf025cce48ef8b734339245092bc986e"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -3319,10 +3319,9 @@ dependencies = [
[[package]] [[package]]
name = "ruma-macros" name = "ruma-macros"
version = "0.13.0" version = "0.13.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=97e2fb6df13f65532d33fc2f0f097ad5a449dd70#97e2fb6df13f65532d33fc2f0f097ad5a449dd70" source = "git+https://github.com/girlbossceo/ruwuma?rev=1a550585bf025cce48ef8b734339245092bc986e#1a550585bf025cce48ef8b734339245092bc986e"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"once_cell",
"proc-macro-crate", "proc-macro-crate",
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3335,7 +3334,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-push-gateway-api" name = "ruma-push-gateway-api"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=97e2fb6df13f65532d33fc2f0f097ad5a449dd70#97e2fb6df13f65532d33fc2f0f097ad5a449dd70" source = "git+https://github.com/girlbossceo/ruwuma?rev=1a550585bf025cce48ef8b734339245092bc986e#1a550585bf025cce48ef8b734339245092bc986e"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -3347,7 +3346,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-server-util" name = "ruma-server-util"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=97e2fb6df13f65532d33fc2f0f097ad5a449dd70#97e2fb6df13f65532d33fc2f0f097ad5a449dd70" source = "git+https://github.com/girlbossceo/ruwuma?rev=1a550585bf025cce48ef8b734339245092bc986e#1a550585bf025cce48ef8b734339245092bc986e"
dependencies = [ dependencies = [
"headers", "headers",
"http", "http",
@ -3360,7 +3359,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-signatures" name = "ruma-signatures"
version = "0.15.0" version = "0.15.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=97e2fb6df13f65532d33fc2f0f097ad5a449dd70#97e2fb6df13f65532d33fc2f0f097ad5a449dd70" source = "git+https://github.com/girlbossceo/ruwuma?rev=1a550585bf025cce48ef8b734339245092bc986e#1a550585bf025cce48ef8b734339245092bc986e"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"ed25519-dalek", "ed25519-dalek",
@ -3376,10 +3375,9 @@ dependencies = [
[[package]] [[package]]
name = "ruma-state-res" name = "ruma-state-res"
version = "0.11.0" version = "0.11.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=97e2fb6df13f65532d33fc2f0f097ad5a449dd70#97e2fb6df13f65532d33fc2f0f097ad5a449dd70" source = "git+https://github.com/girlbossceo/ruwuma?rev=1a550585bf025cce48ef8b734339245092bc986e#1a550585bf025cce48ef8b734339245092bc986e"
dependencies = [ dependencies = [
"futures-util", "futures-util",
"itertools 0.13.0",
"js_int", "js_int",
"ruma-common", "ruma-common",
"ruma-events", "ruma-events",

2
Cargo.toml
View file

@ -334,7 +334,7 @@ version = "0.1.2"
[workspace.dependencies.ruma] [workspace.dependencies.ruma]
git = "https://github.com/girlbossceo/ruwuma" git = "https://github.com/girlbossceo/ruwuma"
#branch = "conduwuit-changes" #branch = "conduwuit-changes"
rev = "97e2fb6df13f65532d33fc2f0f097ad5a449dd70" rev = "1a550585bf025cce48ef8b734339245092bc986e"
features = [ features = [
"compat", "compat",
"rand", "rand",

2
src/service/rooms/event_handler/resolve_state.rs
View file

@ -65,7 +65,6 @@ pub async fn resolve_state(
.collect() .collect()
}) })
.collect() .collect()
.boxed()
.await; .await;
debug!("Resolving state"); debug!("Resolving state");
@ -74,6 +73,7 @@ pub async fn resolve_state(
let event_fetch = |event_id| self.event_fetch(event_id); let event_fetch = |event_id| self.event_fetch(event_id);
let event_exists = |event_id| self.event_exists(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) let state = state_res::resolve(room_version_id, &fork_states, &auth_chain_sets, &event_fetch, &event_exists)
.boxed()
.await .await
.map_err(|e| err!(Database(error!("State resolution failed: {e:?}"))))?; .map_err(|e| err!(Database(error!("State resolution failed: {e:?}"))))?;

1
src/service/rooms/event_handler/state_at_incoming.rs
View file

@ -153,6 +153,7 @@ pub(super) async fn state_at_incoming_resolved(
let event_fetch = |event_id| self.event_fetch(event_id); let event_fetch = |event_id| self.event_fetch(event_id);
let event_exists = |event_id| self.event_exists(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) let result = state_res::resolve(room_version_id, &fork_states, &auth_chain_sets, &event_fetch, &event_exists)
.boxed()
.await .await
.map_err(|e| err!(Database(warn!(?e, "State resolution on prev events failed.")))); .map_err(|e| err!(Database(warn!(?e, "State resolution on prev events failed."))));