Hot-Reloading Refactor

Signed-off-by: Jason Volk <jason@zemos.net>

src/service/rooms/state/data.rs

@@ -5,7 +5,7 @@ use tokio::sync::MutexGuard;
 
 use crate::Result;
 
-pub(crate) trait Data: Send + Sync {
+pub trait Data: Send + Sync {
 	/// Returns the last state hash key added to the db for the given room.
 	fn get_room_shortstatehash(&self, room_id: &RoomId) -> Result<Option<u64>>;
 

src/service/rooms/state/mod.rs

@@ -4,7 +4,7 @@ use std::{
 	sync::Arc,
 };
 
-pub(crate) use data::Data;
+pub use data::Data;
 use ruma::{
 	api::client::error::ErrorKind,
 	events::{
@@ -21,13 +21,13 @@ use tracing::warn;
 use super::state_compressor::CompressedStateEvent;
 use crate::{services, utils::calculate_hash, Error, PduEvent, Result};
 
-pub(crate) struct Service {
-	pub(crate) db: &'static dyn Data,
+pub struct Service {
+	pub db: Arc<dyn Data>,
 }
 
 impl Service {
 	/// Set the room to the given statehash and update caches.
-	pub(crate) async fn force_state(
+	pub async fn force_state(
 		&self,
 		room_id: &RoomId,
 		shortstatehash: u64,
@@ -104,7 +104,7 @@ impl Service {
 	/// This adds all current state events (not including the incoming event)
 	/// to `stateid_pduid` and adds the incoming event to `eventid_statehash`.
 	#[tracing::instrument(skip(self, state_ids_compressed))]
-	pub(crate) fn set_event_state(
+	pub fn set_event_state(
 		&self, event_id: &EventId, room_id: &RoomId, state_ids_compressed: Arc<HashSet<CompressedStateEvent>>,
 	) -> Result<u64> {
 		let shorteventid = services()
@@ -172,7 +172,7 @@ impl Service {
 	/// This adds all current state events (not including the incoming event)
 	/// to `stateid_pduid` and adds the incoming event to `eventid_statehash`.
 	#[tracing::instrument(skip(self, new_pdu))]
-	pub(crate) fn append_to_state(&self, new_pdu: &PduEvent) -> Result<u64> {
+	pub fn append_to_state(&self, new_pdu: &PduEvent) -> Result<u64> {
 		let shorteventid = services()
 			.rooms
 			.short
@@ -244,7 +244,7 @@ impl Service {
 	}
 
 	#[tracing::instrument(skip(self, invite_event))]
-	pub(crate) fn calculate_invite_state(&self, invite_event: &PduEvent) -> Result<Vec<Raw<AnyStrippedStateEvent>>> {
+	pub fn calculate_invite_state(&self, invite_event: &PduEvent) -> Result<Vec<Raw<AnyStrippedStateEvent>>> {
 		let mut state = Vec::new();
 		// Add recommended events
 		if let Some(e) =
@@ -300,7 +300,7 @@ impl Service {
 
 	/// Set the state hash to a new version, but does not update state_cache.
 	#[tracing::instrument(skip(self))]
-	pub(crate) fn set_room_state(
+	pub fn set_room_state(
 		&self,
 		room_id: &RoomId,
 		shortstatehash: u64,
@@ -311,7 +311,7 @@ impl Service {
 
 	/// Returns the room's version.
 	#[tracing::instrument(skip(self))]
-	pub(crate) fn get_room_version(&self, room_id: &RoomId) -> Result<RoomVersionId> {
+	pub fn get_room_version(&self, room_id: &RoomId) -> Result<RoomVersionId> {
 		let create_event = services()
 			.rooms
 			.state_accessor
@@ -331,15 +331,15 @@ impl Service {
 		Ok(create_event_content.room_version)
 	}
 
-	pub(crate) fn get_room_shortstatehash(&self, room_id: &RoomId) -> Result<Option<u64>> {
+	pub fn get_room_shortstatehash(&self, room_id: &RoomId) -> Result<Option<u64>> {
 		self.db.get_room_shortstatehash(room_id)
 	}
 
-	pub(crate) fn get_forward_extremities(&self, room_id: &RoomId) -> Result<HashSet<Arc<EventId>>> {
+	pub fn get_forward_extremities(&self, room_id: &RoomId) -> Result<HashSet<Arc<EventId>>> {
 		self.db.get_forward_extremities(room_id)
 	}
 
-	pub(crate) fn set_forward_extremities(
+	pub fn set_forward_extremities(
 		&self,
 		room_id: &RoomId,
 		event_ids: Vec<OwnedEventId>,
@@ -351,7 +351,7 @@ impl Service {
 
 	/// This fetches auth events from the current state.
 	#[tracing::instrument(skip(self))]
-	pub(crate) fn get_auth_events(
+	pub fn get_auth_events(
 		&self, room_id: &RoomId, kind: &TimelineEventType, sender: &UserId, state_key: Option<&str>,
 		content: &serde_json::value::RawValue,
 	) -> Result<StateMap<Arc<PduEvent>>> {