diff --git a/src/service/globals/mod.rs b/src/service/globals/mod.rs index 3a514d5c..38d7f786 100644 --- a/src/service/globals/mod.rs +++ b/src/service/globals/mod.rs @@ -11,7 +11,6 @@ use conduwuit::{error, utils::bytes::pretty, Config, Result}; use data::Data; use regex::RegexSet; use ruma::{OwnedEventId, OwnedRoomAliasId, OwnedServerName, OwnedUserId, ServerName, UserId}; -use tokio::sync::Mutex; use crate::service; @@ -21,7 +20,6 @@ pub struct Service { pub config: Config, jwt_decoding_key: Option, pub bad_event_ratelimiter: Arc>>, - pub stateres_mutex: Arc>, pub server_user: OwnedUserId, pub admin_alias: OwnedRoomAliasId, pub turn_secret: String, @@ -70,7 +68,6 @@ impl crate::Service for Service { config: config.clone(), jwt_decoding_key, bad_event_ratelimiter: Arc::new(RwLock::new(HashMap::new())), - stateres_mutex: Arc::new(Mutex::new(())), admin_alias: OwnedRoomAliasId::try_from(format!("#admins:{}", &config.server_name)) .expect("#admins:server_name is valid alias name"), server_user: UserId::parse_with_server_name( diff --git a/src/service/rooms/event_handler/resolve_state.rs b/src/service/rooms/event_handler/resolve_state.rs index 0e4b919d..f21f7b66 100644 --- a/src/service/rooms/event_handler/resolve_state.rs +++ b/src/service/rooms/event_handler/resolve_state.rs @@ -116,9 +116,6 @@ pub async fn state_resolution( state_sets: &[StateMap], auth_chain_sets: &[HashSet], ) -> Result> { - //TODO: ??? - let _lock = self.services.globals.stateres_mutex.lock(); - state_res::resolve( room_version, state_sets.iter(),