summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-04 11:56:03 +0000
committerErik Johnston <erik@matrix.org>2019-03-04 11:56:03 +0000
commit8b63fe4c261a4451024dba7506b5872686c22282 (patch)
treedbf461e02af77a900a86aa7dab83c7aff20f238f /synapse
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/stop_fed_n... (diff)
downloadsynapse-8b63fe4c261a4451024dba7506b5872686c22282.tar.xz
s/get_forward_events/get_successor_events/
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/federation.py2
-rw-r--r--synapse/storage/event_federation.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index 0425380e55..32d7ba6cf5 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py
@@ -881,7 +881,7 @@ class FederationHandler(BaseHandler): # join of the server where we are allowed to see the join event but # not anything before it. - forward_events = yield self.store.get_forward_events( + forward_events = yield self.store.get_successor_events( list(extremities), ) diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py
index 830b171caa..a8d90456e3 100644 --- a/synapse/storage/event_federation.py +++ b/synapse/storage/event_federation.py
@@ -443,7 +443,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, return event_results @defer.inlineCallbacks - def get_forward_events(self, event_ids): + def get_successor_events(self, event_ids): """Fetch all events that have the given events as a prev event Args: @@ -457,7 +457,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, column="prev_event_id", iterable=event_ids, retcols=("event_id",), - desc="get_forward_events" + desc="get_successor_events" ) defer.returnValue([