summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-14 13:39:33 +0100
committerErik Johnston <erik@matrix.org>2015-10-14 13:39:33 +0100
commitd7c70d09f0eca7cca7162c358be777d1ecfa2341 (patch)
tree382b0b98d2be2c1350df8dc333a3c72873a297c4 /synapse/storage
parentMerge pull request #303 from matrix-org/markjh/twisted_debugging (diff)
parentRemove unused room_id arg (diff)
downloadsynapse-d7c70d09f0eca7cca7162c358be777d1ecfa2341.tar.xz
Merge pull request #304 from matrix-org/erikj/remove_unused_arg
Remove unused room_id arg
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/state.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index e935b9443b..6f2a50d585 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -54,7 +54,7 @@ class StateStore(SQLBaseStore):
             defer.returnValue({})
 
         event_to_groups = yield self._get_state_group_for_events(
-            room_id, event_ids,
+            event_ids,
         )
 
         groups = set(event_to_groups.values())
@@ -208,7 +208,7 @@ class StateStore(SQLBaseStore):
         )
 
     @defer.inlineCallbacks
-    def get_state_for_events(self, room_id, event_ids, types):
+    def get_state_for_events(self, event_ids, types):
         """Given a list of event_ids and type tuples, return a list of state
         dicts for each event. The state dicts will only have the type/state_keys
         that are in the `types` list.
@@ -225,7 +225,7 @@ class StateStore(SQLBaseStore):
             The dicts are mappings from (type, state_key) -> state_events
         """
         event_to_groups = yield self._get_state_group_for_events(
-            room_id, event_ids,
+            event_ids,
         )
 
         groups = set(event_to_groups.values())
@@ -251,8 +251,8 @@ class StateStore(SQLBaseStore):
         )
 
     @cachedList(cache=_get_state_group_for_event.cache, list_name="event_ids",
-                num_args=2)
-    def _get_state_group_for_events(self, room_id, event_ids):
+                num_args=1)
+    def _get_state_group_for_events(self, event_ids):
         """Returns mapping event_id -> state_group
         """
         def f(txn):