diff options
author | Matthew Hodgson <matthew@matrix.org> | 2018-03-13 22:11:58 +0000 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2018-03-13 22:11:58 +0000 |
commit | 12350e3f9aeac73f80d1c5bb35ef9e5d0887dec0 (patch) | |
tree | 1db11e8ee3cd835de2c8d33aaf9534573d0ac357 /synapse/handlers/e2e_keys.py | |
parent | ensure we always include the members for a given timeline block (diff) | |
parent | typoe (diff) | |
download | synapse-12350e3f9aeac73f80d1c5bb35ef9e5d0887dec0.tar.xz |
merge proper fix to bug 2969
Diffstat (limited to 'synapse/handlers/e2e_keys.py')
-rw-r--r-- | synapse/handlers/e2e_keys.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py index 9aa95f89e6..31b1ece13e 100644 --- a/synapse/handlers/e2e_keys.py +++ b/synapse/handlers/e2e_keys.py @@ -32,7 +32,7 @@ logger = logging.getLogger(__name__) class E2eKeysHandler(object): def __init__(self, hs): self.store = hs.get_datastore() - self.federation = hs.get_replication_layer() + self.federation = hs.get_federation_client() self.device_handler = hs.get_device_handler() self.is_mine = hs.is_mine self.clock = hs.get_clock() @@ -40,7 +40,7 @@ class E2eKeysHandler(object): # doesn't really work as part of the generic query API, because the # query request requires an object POST, but we abuse the # "query handler" interface. - self.federation.register_query_handler( + hs.get_federation_registry().register_query_handler( "client_keys", self.on_federation_query_client_keys ) |