summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-06-07 15:07:11 +0100
committerMark Haines <mark.haines@matrix.org>2016-06-07 15:07:11 +0100
commit0b2158719c43eab87ab7a9448ae1d85008b92b92 (patch)
tree06d35c46e23aae8e66fce453a5506212b2b8991c /synapse/storage
parentMerge pull request #847 from matrix-org/erikj/gc_tick (diff)
downloadsynapse-0b2158719c43eab87ab7a9448ae1d85008b92b92.tar.xz
Remove dead code.
Loading push rules now happens in the datastore, so we can remove
the methods that loaded them outside the datastore.

The ``waiting_for_join_list`` in federation handler is populated by
anything, so can be removed.

The ``_get_members_events_txn`` method isn't called from anywhere
so can be removed.
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/roommember.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py

index 64b4bd371b..8bd693be72 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py
@@ -243,13 +243,6 @@ class RoomMemberStore(SQLBaseStore): user_ids = yield self.get_users_in_room(room_id) defer.returnValue(set(get_domain_from_id(uid) for uid in user_ids)) - def _get_members_events_txn(self, txn, room_id, membership=None, user_id=None): - rows = self._get_members_rows_txn( - txn, - room_id, membership, user_id, - ) - return [r["event_id"] for r in rows] - def _get_members_rows_txn(self, txn, room_id, membership=None, user_id=None): where_clause = "c.room_id = ?" where_values = [room_id]