Assert messages in order

matrix-org · Oct 28, 2021 · b350f46 · b350f46
1 parent 1c62099
commit b350f46
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/synapse/events/utils.py b/synapse/events/utils.py
@@ -283,13 +283,13 @@ def format_event_for_client_v1(d: JsonDict) -> JsonDict:
 
 def format_event_for_client_v2(d: JsonDict) -> JsonDict:
     drop_keys = (
-        "auth_events",
-        "prev_events",
-        "hashes",
-        "signatures",
-        "depth",
-        "origin",
-        "prev_state",
+        # "auth_events",
+        # "prev_events",
+        # "hashes",
+        # "signatures",
+        # "depth",
+        # "origin",
+        # "prev_state",
     )
     for key in drop_keys:
         d.pop(key, None)
@@ -340,6 +340,9 @@ def serialize_event(
 
     d["event_id"] = e.event_id
 
+    # TODO: Remove
+    d["stream_ordering"] = e.internal_metadata.stream_ordering
+
     if "age_ts" in d["unsigned"]:
         d["unsigned"]["age"] = time_now_ms - d["unsigned"]["age_ts"]
         del d["unsigned"]["age_ts"]

diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
@@ -1156,6 +1156,7 @@ async def filter_evts(events: List[EventBase]) -> List[EventBase]:
         results = await self.store.get_events_around(
             room_id, event_id, before_limit, after_limit, event_filter
         )
+        logger.info("results=%s", results)
 
         if event_filter:
             results["events_before"] = event_filter.filter(results["events_before"])