Add constructor from CanonicalJsonObject to StateEvent

benches/state_res_bench.rs

@@ -10,7 +10,6 @@ use criterion::{criterion_group, criterion_main, Criterion};
 use maplit::btreemap;
 use ruma::{
     events::{
-        pdu::EventHash,
         room::{
             join_rules::JoinRule,
             member::{MemberEventContent, MembershipState},
@@ -51,7 +50,7 @@ fn resolution_shallow_auth_chain(c: &mut Criterion) {
         b.iter(|| {
             let _resolved = match StateResolution::resolve(
                 &room_id(),
-                &RoomVersionId::Version2,
+                &RoomVersionId::Version6,
                 &[state_at_bob.clone(), state_at_charlie.clone()],
                 None,
                 &store,
@@ -299,27 +298,11 @@ where
         .iter()
         .map(AsRef::as_ref)
         .map(event_id)
-        .map(|id| {
-            (
-                id,
-                EventHash {
-                    sha256: "hello".into(),
-                },
-            )
-        })
         .collect::<Vec<_>>();
     let prev_events = prev_events
         .iter()
         .map(AsRef::as_ref)
         .map(event_id)
-        .map(|id| {
-            (
-                id,
-                EventHash {
-                    sha256: "hello".into(),
-                },
-            )
-        })
         .collect::<Vec<_>>();
 
     let json = if let Some(state_key) = state_key {

rustfmt.toml

@@ -1 +1 @@
-merge_imports = true
+merge_imports = true

src/state_event.rs

@@ -141,6 +141,17 @@ impl StateEvent {
         ))
     }
 
+    pub fn from_id_canon_obj(
+        id: EventId,
+        json: ruma::serde::CanonicalJsonObject,
+    ) -> Result<Self, serde_json::Error> {
+        Ok(Self::Full(
+            id,
+            // TODO: this is unfortunate (from_value(to_value(json)))...
+            Pdu::RoomV3Pdu(serde_json::from_value(serde_json::to_value(json)?)?),
+        ))
+    }
+
     pub fn to_requester(&self) -> Requester<'_> {
         Requester {
             prev_event_ids: self.prev_event_ids(),