diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-01-28 14:08:24 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-01-28 14:08:24 +0000 |
| commit | 4026d555fabe6f00d865a0c63226799e53a092e1 (patch) | |
| tree | 9a8211924748e48915e1acf6d097e0bff88a03bb /synapse/storage/events_worker.py | |
| parent | Reuse predecessor method (diff) | |
| parent | Remove --process-dependency-links from UPGRADE.rst (#4485) (diff) | |
| download | synapse-4026d555fabe6f00d865a0c63226799e53a092e1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upgrade
Diffstat (limited to 'synapse/storage/events_worker.py')
| -rw-r--r-- | synapse/storage/events_worker.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/synapse/storage/events_worker.py b/synapse/storage/events_worker.py index 599f892858..0a0ca58fc4 100644 --- a/synapse/storage/events_worker.py +++ b/synapse/storage/events_worker.py @@ -23,7 +23,7 @@ from twisted.internet import defer from synapse.api.constants import EventFormatVersions from synapse.api.errors import NotFoundError -from synapse.events import FrozenEvent +from synapse.events import FrozenEvent, event_type_from_format_version # noqa: F401 # these are only included to make the type annotations work from synapse.events.snapshot import EventContext # noqa: F401 from synapse.events.utils import prune_event @@ -412,11 +412,7 @@ class EventsWorkerStore(SQLBaseStore): # of a event format version, so it must be a V1 event. format_version = EventFormatVersions.V1 - # TODO: When we implement new event formats we'll need to use a - # different event python type - assert format_version == EventFormatVersions.V1 - - original_ev = FrozenEvent( + original_ev = event_type_from_format_version(format_version)( event_dict=d, internal_metadata_dict=internal_metadata, rejected_reason=rejected_reason, |