refactor dyn KvTree out of services

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-06-28 22:51:39 +00:00
parent 57acc4f655
commit cb48e25783
69 changed files with 594 additions and 647 deletions

View file

@ -1,8 +1,10 @@
mod data;
use std::sync::Arc;
use conduit::Server;
use conduit::{error, warn, Error, Result, Server};
use data::Data;
use database::KeyValueDatabase;
use database::Database;
use itertools::Itertools;
use ruma::{
events::{
@ -19,18 +21,15 @@ use ruma::{
serde::Raw,
OwnedRoomId, OwnedServerName, OwnedUserId, RoomId, ServerName, UserId,
};
use tracing::{error, warn};
use crate::{service::appservice::RegistrationInfo, services, user_is_local, Error, Result};
mod data;
use crate::{appservice::RegistrationInfo, services, user_is_local};
pub struct Service {
pub db: Data,
db: Data,
}
impl Service {
pub fn build(_server: &Arc<Server>, db: &Arc<KeyValueDatabase>) -> Result<Self> {
pub fn build(_server: &Arc<Server>, db: &Arc<Database>) -> Result<Self> {
Ok(Self {
db: Data::new(db),
})