summary refs log tree commit diff
path: root/synapse/state.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-12-16 15:07:38 +0000
committerMark Haines <mark.haines@matrix.org>2014-12-16 15:08:37 +0000
commit8b8beba194f45b171345a44d4b42841d5e7311d3 (patch)
tree39cb996df0546c0b694b7ffeb1308d4a1c911e9d /synapse/state.py
parentMerge pull request #25 from matrix-org/events_refactor (diff)
downloadsynapse-8b8beba194f45b171345a44d4b42841d5e7311d3.tar.xz
Remove annotate_event_with_state as nothing was using it. Update state tests to call annotate_context_with_state
Diffstat (limited to 'synapse/state.py')
-rw-r--r--synapse/state.py66
1 files changed, 0 insertions, 66 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 38adde4dc9..61b14b939f 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -22,7 +22,6 @@ from synapse.api.constants import EventTypes
 
 from collections import namedtuple
 
-import copy
 import logging
 import hashlib
 
@@ -44,71 +43,6 @@ class StateHandler(object):
         self.store = hs.get_datastore()
 
     @defer.inlineCallbacks
-    @log_function
-    def annotate_event_with_state(self, event, old_state=None):
-        """ Annotates the event with the current state events as of that event.
-
-        This method adds three new attributes to the event:
-            * `state_events`: The state up to and including the event. Encoded
-              as a dict mapping tuple (type, state_key) -> event.
-            * `old_state_events`: The state up to, but excluding, the event.
-              Encoded similarly as `state_events`.
-            * `state_group`: If there is an existing state group that can be
-              used, then return that. Otherwise return `None`. See state
-              storage for more information.
-
-        If the argument `old_state` is given (in the form of a list of
-        events), then they are used as a the values for `old_state_events` and
-        the value for `state_events` is generated from it. `state_group` is
-        set to None.
-
-        This needs to be called before persisting the event.
-        """
-        yield run_on_reactor()
-
-        if old_state:
-            event.state_group = None
-            event.old_state_events = {
-                (s.type, s.state_key): s for s in old_state
-            }
-            event.state_events = event.old_state_events
-
-            if hasattr(event, "state_key"):
-                event.state_events[(event.type, event.state_key)] = event
-
-            defer.returnValue(False)
-            return
-
-        if hasattr(event, "outlier") and event.outlier:
-            event.state_group = None
-            event.old_state_events = None
-            event.state_events = None
-            defer.returnValue(False)
-            return
-
-        ids = [e for e, _ in event.prev_events]
-
-        ret = yield self.resolve_state_groups(ids)
-        state_group, new_state, _ = ret
-
-        event.old_state_events = copy.deepcopy(new_state)
-
-        if hasattr(event, "state_key"):
-            key = (event.type, event.state_key)
-            if key in new_state:
-                event.replaces_state = new_state[key].event_id
-            new_state[key] = event
-        elif state_group:
-            event.state_group = state_group
-            event.state_events = new_state
-            defer.returnValue(False)
-
-        event.state_group = None
-        event.state_events = new_state
-
-        defer.returnValue(hasattr(event, "state_key"))
-
-    @defer.inlineCallbacks
     def get_current_state(self, room_id, event_type=None, state_key=""):
         """ Returns the current state for the room as a list. This is done by
         calling `get_latest_events_in_room` to get the leading edges of the