diff options
| author | Erik Johnston <erikj@jki.re> | 2018-02-16 11:52:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-16 11:52:51 +0000 |
| commit | bf5ef10a93c0f39c4260b341cc0eca61d143f154 (patch) | |
| tree | 2fc05e9438db06f200bee80be9b4d4fff67d5ff1 /synapse/events | |
| parent | Merge pull request #2873 from matrix-org/erikj/event_creator_no_state (diff) | |
| parent | Fix typo of double is_highlight (diff) | |
| download | synapse-bf5ef10a93c0f39c4260b341cc0eca61d143f154.tar.xz | |
Merge pull request #2874 from matrix-org/erikj/creator_push_actions
Store push actions in DB staging area instead of context
Diffstat (limited to 'synapse/events')
| -rw-r--r-- | synapse/events/snapshot.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/synapse/events/snapshot.py b/synapse/events/snapshot.py index f9445bef13..8e684d91b5 100644 --- a/synapse/events/snapshot.py +++ b/synapse/events/snapshot.py @@ -52,7 +52,6 @@ class EventContext(object): "prev_state_ids", "state_group", "rejected", - "push_actions", "prev_group", "delta_ids", "prev_state_events", @@ -67,7 +66,6 @@ class EventContext(object): self.state_group = None self.rejected = False - self.push_actions = [] # A previously persisted state group and a delta between that # and this state. @@ -104,7 +102,6 @@ class EventContext(object): "event_state_key": event.state_key if event.is_state() else None, "state_group": self.state_group, "rejected": self.rejected, - "push_actions": self.push_actions, "prev_group": self.prev_group, "delta_ids": _encode_state_dict(self.delta_ids), "prev_state_events": self.prev_state_events, @@ -127,7 +124,6 @@ class EventContext(object): context = EventContext() context.state_group = input["state_group"] context.rejected = input["rejected"] - context.push_actions = input["push_actions"] context.prev_group = input["prev_group"] context.delta_ids = _decode_state_dict(input["delta_ids"]) context.prev_state_events = input["prev_state_events"] |