devirtualize service Data traits

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

src/service/account_data/mod.rs

@@ -2,40 +2,46 @@ mod data;
 
 use std::{collections::HashMap, sync::Arc};
 
-pub use data::Data;
+use conduit::{Result, Server};
+use data::Data;
+use database::KeyValueDatabase;
 use ruma::{
 	events::{AnyEphemeralRoomEvent, RoomAccountDataEventType},
 	serde::Raw,
 	RoomId, UserId,
 };
 
-use crate::Result;
-
 pub struct Service {
-	pub db: Arc<dyn Data>,
+	db: Data,
 }
 
 impl Service {
+	pub fn build(_server: &Arc<Server>, db: &Arc<KeyValueDatabase>) -> Result<Self> {
+		Ok(Self {
+			db: Data::new(db),
+		})
+	}
+
 	/// Places one event in the account data of the user and removes the
 	/// previous entry.
-	#[tracing::instrument(skip(self, room_id, user_id, event_type, data))]
+	#[allow(clippy::needless_pass_by_value)]
 	pub fn update(
 		&self, room_id: Option<&RoomId>, user_id: &UserId, event_type: RoomAccountDataEventType,
 		data: &serde_json::Value,
 	) -> Result<()> {
-		self.db.update(room_id, user_id, event_type, data)
+		self.db.update(room_id, user_id, &event_type, data)
 	}
 
 	/// Searches the account data for a specific kind.
-	#[tracing::instrument(skip(self, room_id, user_id, event_type))]
+	#[allow(clippy::needless_pass_by_value)]
 	pub fn get(
 		&self, room_id: Option<&RoomId>, user_id: &UserId, event_type: RoomAccountDataEventType,
 	) -> Result<Option<Box<serde_json::value::RawValue>>> {
-		self.db.get(room_id, user_id, event_type)
+		self.db.get(room_id, user_id, &event_type)
 	}
 
 	/// Returns all changes to the account data that happened after `since`.
-	#[tracing::instrument(skip(self, room_id, user_id, since))]
+	#[tracing::instrument(skip_all, name = "since")]
 	pub fn changes_since(
 		&self, room_id: Option<&RoomId>, user_id: &UserId, since: u64,
 	) -> Result<HashMap<RoomAccountDataEventType, Raw<AnyEphemeralRoomEvent>>> {