convert_to_outgoing_federation_event takes CanonicalJsonObj

2020-11-30 14:46:47 -05:00
parent 27e686f9ff
commit c173ce43a5
3 changed files with 19 additions and 21 deletions
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -385,8 +385,8 @@ impl Rooms {
        })
    }

-    /// Returns the pdu.
-    pub fn get_pdu_json_from_id(&self, pdu_id: &[u8]) -> Result<Option<serde_json::Value>> {
+    /// Returns the pdu as a `BTreeMap<String, CanonicalJsonValue>`.
+    pub fn get_pdu_json_from_id(&self, pdu_id: &[u8]) -> Result<Option<CanonicalJsonObject>> {
        self.pduid_pdu.get(pdu_id)?.map_or(Ok(None), |pdu| {
            Ok(Some(
                serde_json::from_slice(&pdu)