diff options
| author | Erik Johnston <erik@matrix.org> | 2019-03-08 15:05:32 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-03-08 15:05:32 +0000 |
| commit | 5536ddba754fcdd65f8286c75829bf7860a393a5 (patch) | |
| tree | 0211e5f44e4533bc435ba3326a5e51cd7dd71ed3 /synapse | |
| parent | Merge pull request #4814 from matrix-org/erikj/soft_fail_impl (diff) | |
| download | synapse-5536ddba754fcdd65f8286c75829bf7860a393a5.tar.xz | |
Make `prev_state` field optional
The `prev_state` field on events is not specced and so synapse shouldn't explode if an event is missing the field. Fixes #4787
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/events/__init__.py | 1 | ||||
| -rw-r--r-- | synapse/storage/events.py | 15 |
2 files changed, 0 insertions, 16 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index bd130f8816..fafa135182 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -141,7 +141,6 @@ class EventBase(object): origin = _event_dict_property("origin") origin_server_ts = _event_dict_property("origin_server_ts") prev_events = _event_dict_property("prev_events") - prev_state = _event_dict_property("prev_state") redacts = _event_dict_property("redacts") room_id = _event_dict_property("room_id") sender = _event_dict_property("sender") diff --git a/synapse/storage/events.py b/synapse/storage/events.py index 990a5eaaae..428300ea0a 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -1407,21 +1407,6 @@ class EventsStore(StateGroupWorkerStore, EventFederationStore, EventsWorkerStore values=state_values, ) - self._simple_insert_many_txn( - txn, - table="event_edges", - values=[ - { - "event_id": event.event_id, - "prev_event_id": prev_id, - "room_id": event.room_id, - "is_state": True, - } - for event, _ in state_events_and_contexts - for prev_id, _ in event.prev_state - ], - ) - # Prefill the event cache self._add_to_cache(txn, events_and_contexts) |