diff options
| author | Erik Johnston <erikj@jki.re> | 2019-05-15 10:17:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-15 10:17:38 +0100 |
| commit | d94544051b5b6ac1a229c3e8f868ea2d3324c295 (patch) | |
| tree | 08617ba7c1c06ac016aee5227d75aa693ef4a0e1 /synapse/storage/event_federation.py | |
| parent | Merge pull request #5185 from matrix-org/erikj/fix_config_ratelimiting (diff) | |
| parent | Update docstring with correct type (diff) | |
| download | synapse-d94544051b5b6ac1a229c3e8f868ea2d3324c295.tar.xz | |
Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_array
Expose DataStore._get_events as get_events_as_list
Diffstat (limited to 'synapse/storage/event_federation.py')
| -rw-r--r-- | synapse/storage/event_federation.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py index 956f876572..09e39c2c28 100644 --- a/synapse/storage/event_federation.py +++ b/synapse/storage/event_federation.py @@ -45,7 +45,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, SQLBas """ return self.get_auth_chain_ids( event_ids, include_given=include_given - ).addCallback(self._get_events) + ).addCallback(self.get_events_as_list) def get_auth_chain_ids(self, event_ids, include_given=False): """Get auth events for given event_ids. The events *must* be state events. @@ -316,7 +316,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, SQLBas event_list, limit, ) - .addCallback(self._get_events) + .addCallback(self.get_events_as_list) .addCallback(lambda l: sorted(l, key=lambda e: -e.depth)) ) @@ -382,7 +382,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, SQLBas latest_events, limit, ) - events = yield self._get_events(ids) + events = yield self.get_events_as_list(ids) defer.returnValue(events) def _get_missing_events(self, txn, room_id, earliest_events, latest_events, limit): |