refactor dyn KvTree out of services

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

src/service/transaction_ids/data.rs

@@ -1,17 +1,17 @@
 use std::sync::Arc;
 
 use conduit::Result;
-use database::{KeyValueDatabase, KvTree};
+use database::{Database, Map};
 use ruma::{DeviceId, TransactionId, UserId};
 
 pub struct Data {
-	userdevicetxnid_response: Arc<dyn KvTree>,
+	userdevicetxnid_response: Arc<Map>,
 }
 
 impl Data {
-	pub(super) fn new(db: &Arc<KeyValueDatabase>) -> Self {
+	pub(super) fn new(db: &Arc<Database>) -> Self {
 		Self {
-			userdevicetxnid_response: db.userdevicetxnid_response.clone(),
+			userdevicetxnid_response: db["userdevicetxnid_response"].clone(),
 		}
 	}
 

src/service/transaction_ids/mod.rs

@@ -1,21 +1,18 @@
-use conduit::Server;
-use database::KeyValueDatabase;
-
 mod data;
 
 use std::sync::Arc;
 
+use conduit::{Result, Server};
 use data::Data;
+use database::Database;
 use ruma::{DeviceId, TransactionId, UserId};
 
-use crate::Result;
-
 pub struct Service {
 	pub 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),
 		})