From 82ac6b01b2da84f21b72a86c898ea3e6f90699fc Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Fri, 7 Jun 2024 03:40:58 -0400
Subject: [PATCH] service(auth_chain): use `self` instead of `services()`
Signed-off-by: strawberry <strawberry@puppygock.gay>
---
src/service/rooms/auth_chain/mod.rs | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/src/service/rooms/auth_chain/mod.rs b/src/service/rooms/auth_chain/mod.rs
index fce98521..84e423e3 100644
--- a/src/service/rooms/auth_chain/mod.rs
+++ b/src/service/rooms/auth_chain/mod.rs
@@ -63,11 +63,7 @@ impl Service {
}
let chunk_key: Vec<u64> = chunk.iter().map(|(short, _)| short).copied().collect();
- if let Some(cached) = services()
- .rooms
- .auth_chain
- .get_cached_eventid_authchain(&chunk_key)?
- {
+ if let Some(cached) = self.get_cached_eventid_authchain(&chunk_key)? {
trace!("Found cache entry for whole chunk");
full_auth_chain.extend(cached.iter().copied());
hits = hits.saturating_add(1);
@@ -78,20 +74,13 @@ impl Service {
let mut misses2: usize = 0;
let mut chunk_cache = Vec::with_capacity(chunk.len());
for (sevent_id, event_id) in chunk {
- if let Some(cached) = services()
- .rooms
- .auth_chain
- .get_cached_eventid_authchain(&[sevent_id])?
- {
+ if let Some(cached) = self.get_cached_eventid_authchain(&[sevent_id])? {
trace!(?event_id, "Found cache entry for event");
chunk_cache.extend(cached.iter().copied());
hits2 = hits2.saturating_add(1);
} else {
let auth_chain = self.get_auth_chain_inner(room_id, event_id)?;
- services()
- .rooms
- .auth_chain
- .cache_auth_chain(vec![sevent_id], &auth_chain)?;
+ self.cache_auth_chain(vec![sevent_id], &auth_chain)?;
chunk_cache.extend(auth_chain.iter());
misses2 = misses2.saturating_add(1);
debug!(
@@ -106,10 +95,7 @@ impl Service {
chunk_cache.sort_unstable();
chunk_cache.dedup();
- services()
- .rooms
- .auth_chain
- .cache_auth_chain_vec(chunk_key, &chunk_cache)?;
+ self.cache_auth_chain_vec(chunk_key, &chunk_cache)?;
full_auth_chain.extend(chunk_cache.iter());
misses = misses.saturating_add(1);
debug!(