dissolve key_value/*

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

src/service/rooms/outlier/data.rs

@@ -1,9 +1,34 @@
 use ruma::{CanonicalJsonObject, EventId};
 
-use crate::{PduEvent, Result};
+use crate::{Error, KeyValueDatabase, PduEvent, Result};
 
 pub trait Data: Send + Sync {
 	fn get_outlier_pdu_json(&self, event_id: &EventId) -> Result<Option<CanonicalJsonObject>>;
 	fn get_outlier_pdu(&self, event_id: &EventId) -> Result<Option<PduEvent>>;
 	fn add_pdu_outlier(&self, event_id: &EventId, pdu: &CanonicalJsonObject) -> Result<()>;
 }
+
+impl Data for KeyValueDatabase {
+	fn get_outlier_pdu_json(&self, event_id: &EventId) -> Result<Option<CanonicalJsonObject>> {
+		self.eventid_outlierpdu
+			.get(event_id.as_bytes())?
+			.map_or(Ok(None), |pdu| {
+				serde_json::from_slice(&pdu).map_err(|_| Error::bad_database("Invalid PDU in db."))
+			})
+	}
+
+	fn get_outlier_pdu(&self, event_id: &EventId) -> Result<Option<PduEvent>> {
+		self.eventid_outlierpdu
+			.get(event_id.as_bytes())?
+			.map_or(Ok(None), |pdu| {
+				serde_json::from_slice(&pdu).map_err(|_| Error::bad_database("Invalid PDU in db."))
+			})
+	}
+
+	fn add_pdu_outlier(&self, event_id: &EventId, pdu: &CanonicalJsonObject) -> Result<()> {
+		self.eventid_outlierpdu.insert(
+			event_id.as_bytes(),
+			&serde_json::to_vec(&pdu).expect("CanonicalJsonObject is valid"),
+		)
+	}
+}

src/service/rooms/outlier/mod.rs

@@ -2,7 +2,7 @@ mod data;
 
 use std::sync::Arc;
 
-pub use data::Data;
+use data::Data;
 use ruma::{CanonicalJsonObject, EventId};
 
 use crate::{PduEvent, Result};