refactor dyn KvTree out of services

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

src/service/rooms/outlier/data.rs

@@ -1,18 +1,19 @@
 use std::sync::Arc;
 
-use database::KvTree;
+use conduit::{Error, Result};
+use database::{Database, Map};
 use ruma::{CanonicalJsonObject, EventId};
 
-use crate::{Error, KeyValueDatabase, PduEvent, Result};
+use crate::PduEvent;
 
-pub struct Data {
-	eventid_outlierpdu: Arc<dyn KvTree>,
+pub(super) struct Data {
+	eventid_outlierpdu: Arc<Map>,
 }
 
 impl Data {
-	pub(super) fn new(db: &Arc<KeyValueDatabase>) -> Self {
+	pub(super) fn new(db: &Arc<Database>) -> Self {
 		Self {
-			eventid_outlierpdu: db.eventid_outlierpdu.clone(),
+			eventid_outlierpdu: db["eventid_outlierpdu"].clone(),
 		}
 	}
 

src/service/rooms/outlier/mod.rs

@@ -1,21 +1,20 @@
-use conduit::Server;
-use database::KeyValueDatabase;
-
 mod data;
 
 use std::sync::Arc;
 
+use conduit::{Result, Server};
 use data::Data;
+use database::Database;
 use ruma::{CanonicalJsonObject, EventId};
 
-use crate::{PduEvent, Result};
+use crate::PduEvent;
 
 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),
 		})