summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-16 19:16:41 +0000
committerErik Johnston <erik@matrix.org>2014-12-16 19:16:41 +0000
commitdec5b62339705401fd280b423fbc8cec5add0ca8 (patch)
tree98b63bd639d9ff5b1a818470bd708cd6fbf17f45
parentFix where we pulled in event.state_events from hotfixes branch (diff)
downloadsynapse-dec5b62339705401fd280b423fbc8cec5add0ca8.tar.xz
Use _get_events_txn instead of _parse_events_txn
-rw-r--r--synapse/storage/event_federation.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py

index 7a6009c9ee..fb2eb21713 100644 --- a/synapse/storage/event_federation.py +++ b/synapse/storage/event_federation.py
@@ -42,13 +42,7 @@ class EventFederationStore(SQLBaseStore): def _get_auth_chain_txn(self, txn, event_ids): results = self._get_auth_chain_ids_txn(txn, event_ids) - sql = "SELECT * FROM events WHERE event_id = ?" - rows = [] - for ev_id in results: - c = txn.execute(sql, (ev_id,)) - rows.extend(self.cursor_to_dict(c)) - - return self._parse_events_txn(txn, rows) + return self._get_events_txn(txn, results) def get_auth_chain_ids(self, event_ids): return self.runInteraction(