summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-09-02 10:49:43 +0100
committerErik Johnston <erik@matrix.org>2016-09-02 10:53:36 +0100
commit2854ee2a52226df9f29acb7d8c141af2a6546d21 (patch)
treedcc91870df134e6a3c7526d46d1e155d0cfe740b /synapse/federation
parentMerge pull request #1061 from matrix-org/erikj/linearize_resolution (diff)
downloadsynapse-2854ee2a52226df9f29acb7d8c141af2a6546d21.tar.xz
Only pull out IDs from DB for /state_ids/ request
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/federation_server.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py

index aba19639c7..5621655098 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py
@@ -223,16 +223,14 @@ class FederationServer(FederationBase): if not in_room: raise AuthError(403, "Host not in room.") - pdus = yield self.handler.get_state_for_pdu( + state_ids = yield self.handler.get_state_ids_for_pdu( room_id, event_id, ) - auth_chain = yield self.store.get_auth_chain( - [pdu.event_id for pdu in pdus] - ) + auth_chain_ids = yield self.store.get_auth_chain_ids(state_ids) defer.returnValue((200, { - "pdu_ids": [pdu.event_id for pdu in pdus], - "auth_chain_ids": [pdu.event_id for pdu in auth_chain], + "pdu_ids": state_ids, + "auth_chain_ids": auth_chain_ids, })) @defer.inlineCallbacks