From 0fd5d157ba6c24bd5eadffd0a67693a31db1a5db Mon Sep 17 00:00:00 2001 From: Hugh Nimmo-Smith Date: Tue, 9 Apr 2024 16:15:05 +0100 Subject: [PATCH] Consistent naming --- rust/src/rendezvous/mod.rs | 6 +++--- synapse/server.py | 6 +++--- synapse/synapse_rust/rendezvous.pyi | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rust/src/rendezvous/mod.rs b/rust/src/rendezvous/mod.rs index f8f800fe1d4..f4ac98ecf66 100644 --- a/rust/src/rendezvous/mod.rs +++ b/rust/src/rendezvous/mod.rs @@ -60,13 +60,13 @@ fn check_input_headers(headers: &HeaderMap) -> PyResult { // TODO: handle eviction #[pyclass] -struct RendezVousHandler { +struct RendezvousHandler { base: Uri, sessions: HashMap, } #[pymethods] -impl RendezVousHandler { +impl RendezvousHandler { #[new] fn new(py: Python<'_>, homeserver: &PyAny) -> PyResult> { let base: String = homeserver @@ -228,7 +228,7 @@ impl RendezVousHandler { pub fn register_module(py: Python<'_>, m: &PyModule) -> PyResult<()> { let child_module = PyModule::new(py, "rendezvous")?; - child_module.add_class::()?; + child_module.add_class::()?; m.add_submodule(child_module)?; diff --git a/synapse/server.py b/synapse/server.py index e282175dee4..2a366f1af6a 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -150,7 +150,7 @@ from synapse.util.ratelimitutils import FederationRateLimiter from synapse.util.stringutils import random_string from synapse.util.task_scheduler import TaskScheduler -from synapse.synapse_rust.rendezvous import RendezVousHandler +from synapse.synapse_rust.rendezvous import RendezvousHandler logger = logging.getLogger(__name__) @@ -861,8 +861,8 @@ def get_room_forgetter_handler(self) -> RoomForgetterHandler: return RoomForgetterHandler(self) @cache_in_self - def get_rendezvous_handler(self) -> RendezVousHandler: - return RendezVousHandler(self) + def get_rendezvous_handler(self) -> RendezvousHandler: + return RendezvousHandler(self) @cache_in_self def get_outbound_redis_connection(self) -> "ConnectionHandler": diff --git a/synapse/synapse_rust/rendezvous.pyi b/synapse/synapse_rust/rendezvous.pyi index e02719c176b..34ec27c69ef 100644 --- a/synapse/synapse_rust/rendezvous.pyi +++ b/synapse/synapse_rust/rendezvous.pyi @@ -13,7 +13,7 @@ from synapse.server import HomeServer from twisted.web.iweb import IRequest -class RendezVousHandler: +class RendezvousHandler: def __init__(self, homeserver: HomeServer): ... def handle_post(self, request: IRequest): ... def handle_get(self, request: IRequest, session_id: str): ...