summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-05-25 14:28:34 +0100
committerErik Johnston <erik@matrix.org>2017-05-25 14:28:34 +0100
commitdbc0dfd2d5f4b09b1151070d55e2826736324f38 (patch)
treee398c48125f229c788d131d631f26ff073bc3282
parentMerge pull request #2247 from matrix-org/erikj/auth_event (diff)
downloadsynapse-dbc0dfd2d5f4b09b1151070d55e2826736324f38.tar.xz
Remove unused options
Diffstat (limited to '')
-rw-r--r--synapse/state.py15
1 files changed, 4 insertions, 11 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 02fee47f39..536e2dc65f 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -239,16 +239,9 @@ class StateHandler(object):
             defer.returnValue(context)
 
         logger.debug("calling resolve_state_groups from compute_event_context")
-        if event.is_state():
-            entry = yield self.resolve_state_groups(
-                event.room_id, [e for e, _ in event.prev_events],
-                event_type=event.type,
-                state_key=event.state_key,
-            )
-        else:
-            entry = yield self.resolve_state_groups(
-                event.room_id, [e for e, _ in event.prev_events],
-            )
+        entry = yield self.resolve_state_groups(
+            event.room_id, [e for e, _ in event.prev_events],
+        )
 
         curr_state = entry.state
 
@@ -284,7 +277,7 @@ class StateHandler(object):
 
     @defer.inlineCallbacks
     @log_function
-    def resolve_state_groups(self, room_id, event_ids, event_type=None, state_key=""):
+    def resolve_state_groups(self, room_id, event_ids):
         """ Given a list of event_ids this method fetches the state at each
         event, resolves conflicts between them and returns them.