diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 85ce6bea1a..f9cf9abaed 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -18,7 +18,7 @@ from synapse.storage.events_worker import EventsWorkerStore
from twisted.internet import defer
-from synapse.events import USE_FROZEN_DICTS
+from synapse.events import USE_FROZEN_DICTS, CompactEvent
from synapse.util.async import ObservableDeferred
from synapse.util.logcontext import (
@@ -1254,7 +1254,7 @@ class EventsStore(EventsWorkerStore):
event = ev_map[row["event_id"]]
if not row["rejects"] and not row["redacts"]:
to_prefill.append(_EventCacheEntry(
- event=event,
+ event=CompactEvent.from_event(event),
redacted_event=None,
))
diff --git a/synapse/storage/events_worker.py b/synapse/storage/events_worker.py
index 2e23dd78ba..79c0c630b2 100644
--- a/synapse/storage/events_worker.py
+++ b/synapse/storage/events_worker.py
@@ -16,7 +16,7 @@ from ._base import SQLBaseStore
from twisted.internet import defer, reactor
-from synapse.events import FrozenEvent
+from synapse.events import CompactEvent
from synapse.events.utils import prune_event
from synapse.util.logcontext import (
@@ -69,7 +69,7 @@ class EventsWorkerStore(SQLBaseStore):
False throw an exception.
Returns:
- Deferred : A FrozenEvent.
+ Deferred : A CompactEvent.
"""
events = yield self._get_events(
[event_id],
@@ -354,7 +354,7 @@ class EventsWorkerStore(SQLBaseStore):
desc="_get_event_from_row_rejected_reason",
)
- original_ev = FrozenEvent(
+ original_ev = CompactEvent(
d,
internal_metadata_dict=internal_metadata,
rejected_reason=rejected_reason,
|
