diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-03 17:19:15 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-03 17:19:15 +0100 |
| commit | edb33eb163b6c60bfd2c3cab78a6bd13a47b6702 (patch) | |
| tree | 061d978db20b27b8ada65bda1944bb41ccac0de6 | |
| parent | Fix copy + paste fails (diff) | |
| download | synapse-edb33eb163b6c60bfd2c3cab78a6bd13a47b6702.tar.xz | |
Rename fields to _ids
Diffstat (limited to '')
| -rw-r--r-- | synapse/federation/federation_client.py | 4 | ||||
| -rw-r--r-- | synapse/federation/federation_server.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index dde10967be..264f3c0aec 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -322,8 +322,8 @@ class FederationClient(FederationBase): destination, room_id, event_id=event_id, ) - state_event_ids = result["pdus"] - auth_event_ids = result.get("auth_chain", []) + state_event_ids = result["pdu_ids"] + auth_event_ids = result.get("auth_chain_ids", []) fetched_events, failed_to_fetch = yield self.get_events( [destination], room_id, set(state_event_ids + auth_event_ids) diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 35a01eecca..2b91f93e09 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -231,8 +231,8 @@ class FederationServer(FederationBase): ) defer.returnValue((200, { - "pdus": [pdu.event_id for pdu in pdus], - "auth_chain": [pdu.event_id for pdu in auth_chain], + "pdu_ids": [pdu.event_id for pdu in pdus], + "auth_chain_ids": [pdu.event_id for pdu in auth_chain], })) @defer.inlineCallbacks |