diff options
| author | Erik Johnston <erik@matrix.org> | 2022-05-31 13:17:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-31 12:17:50 +0000 |
| commit | 1e453053cb12ff084fdcdc2f75c08ced274dff21 (patch) | |
| tree | 4be06cbed3e79c7b107eebcf2ebd7b4e5c1427da /synapse/replication | |
| parent | Rework stream token to stop caring about groups. (#12897) (diff) | |
| download | synapse-1e453053cb12ff084fdcdc2f75c08ced274dff21.tar.xz | |
Rename storage classes (#12913)
Diffstat (limited to 'synapse/replication')
| -rw-r--r-- | synapse/replication/http/federation.py | 4 | ||||
| -rw-r--r-- | synapse/replication/http/send_event.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/synapse/replication/http/federation.py b/synapse/replication/http/federation.py index 3e7300b4a1..eed29cd597 100644 --- a/synapse/replication/http/federation.py +++ b/synapse/replication/http/federation.py @@ -69,7 +69,7 @@ class ReplicationFederationSendEventsRestServlet(ReplicationEndpoint): super().__init__(hs) self.store = hs.get_datastores().main - self.storage = hs.get_storage() + self._storage_controllers = hs.get_storage_controllers() self.clock = hs.get_clock() self.federation_event_handler = hs.get_federation_event_handler() @@ -133,7 +133,7 @@ class ReplicationFederationSendEventsRestServlet(ReplicationEndpoint): event.internal_metadata.outlier = event_payload["outlier"] context = EventContext.deserialize( - self.storage, event_payload["context"] + self._storage_controllers, event_payload["context"] ) event_and_contexts.append((event, context)) diff --git a/synapse/replication/http/send_event.py b/synapse/replication/http/send_event.py index ce78176836..c2b2588ea5 100644 --- a/synapse/replication/http/send_event.py +++ b/synapse/replication/http/send_event.py @@ -70,7 +70,7 @@ class ReplicationSendEventRestServlet(ReplicationEndpoint): self.event_creation_handler = hs.get_event_creation_handler() self.store = hs.get_datastores().main - self.storage = hs.get_storage() + self._storage_controllers = hs.get_storage_controllers() self.clock = hs.get_clock() @staticmethod @@ -127,7 +127,9 @@ class ReplicationSendEventRestServlet(ReplicationEndpoint): event.internal_metadata.outlier = content["outlier"] requester = Requester.deserialize(self.store, content["requester"]) - context = EventContext.deserialize(self.storage, content["context"]) + context = EventContext.deserialize( + self._storage_controllers, content["context"] + ) ratelimit = content["ratelimit"] extra_users = [UserID.from_string(u) for u in content["extra_users"]] |