Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop backwards compat hack for event serialization (#16069)

This commit is contained in:
Shay 2023-08-07 10:37:08 -07:00 committed by GitHub
parent 9d3713d6d5
commit 81a6f8c9ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/16069.misc Normal file
View File

@ -0,0 +1 @@
Drop backwards compat hack for event serialization.

12
synapse/events/snapshot.py
View File

@ -186,9 +186,6 @@ class EventContext(UnpersistedEventContextBase):
), ),
"app_service_id": self.app_service.id if self.app_service else None, "app_service_id": self.app_service.id if self.app_service else None,
"partial_state": self.partial_state, "partial_state": self.partial_state,
# add dummy delta_ids and prev_group for backwards compatibility
"delta_ids": None,
"prev_group": None,
} }
@staticmethod @staticmethod
@ -203,13 +200,6 @@ class EventContext(UnpersistedEventContextBase):
Returns: Returns:
The event context. The event context.
""" """
# workaround for backwards/forwards compatibility: if the input doesn't have a value
# for "state_group_deltas" just assign an empty dict
state_group_deltas = input.get("state_group_deltas", None)
if state_group_deltas:
state_group_deltas = _decode_state_group_delta(state_group_deltas)
else:
state_group_deltas = {}
context = EventContext( context = EventContext(
# We use the state_group and prev_state_id stuff to pull the # We use the state_group and prev_state_id stuff to pull the
@ -217,7 +207,7 @@ class EventContext(UnpersistedEventContextBase):
storage=storage, storage=storage,
state_group=input["state_group"], state_group=input["state_group"],
state_group_before_event=input["state_group_before_event"], state_group_before_event=input["state_group_before_event"],
state_group_deltas=state_group_deltas, state_group_deltas=_decode_state_group_delta(input["state_group_deltas"]),
state_delta_due_to_event=_decode_state_dict( state_delta_due_to_event=_decode_state_dict(
input["state_delta_due_to_event"] input["state_delta_due_to_event"]
), ),