diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-20 10:32:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-20 10:32:02 +0000 |
| commit | fa780e9721c940479a72eed9877ccad4fef78160 (patch) | |
| tree | 2953c373ed13a1b72d4bb3a827db280c2087870c /synapse/replication | |
| parent | Explode on duplicate delta file names. (#6565) (diff) | |
| download | synapse-fa780e9721c940479a72eed9877ccad4fef78160.tar.xz | |
Change EventContext to use the Storage class (#6564)
Diffstat (limited to 'synapse/replication')
| -rw-r--r-- | synapse/replication/http/federation.py | 5 | ||||
| -rw-r--r-- | synapse/replication/http/send_event.py | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/synapse/replication/http/federation.py b/synapse/replication/http/federation.py index 9af4e7e173..49a3251372 100644 --- a/synapse/replication/http/federation.py +++ b/synapse/replication/http/federation.py @@ -51,6 +51,7 @@ class ReplicationFederationSendEventsRestServlet(ReplicationEndpoint): super(ReplicationFederationSendEventsRestServlet, self).__init__(hs) self.store = hs.get_datastore() + self.storage = hs.get_storage() self.clock = hs.get_clock() self.federation_handler = hs.get_handlers().federation_handler @@ -100,7 +101,9 @@ class ReplicationFederationSendEventsRestServlet(ReplicationEndpoint): EventType = event_type_from_format_version(format_ver) event = EventType(event_dict, internal_metadata, rejected_reason) - context = EventContext.deserialize(self.store, event_payload["context"]) + context = EventContext.deserialize( + self.storage, 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 9bafd60b14..84b92f16ad 100644 --- a/synapse/replication/http/send_event.py +++ b/synapse/replication/http/send_event.py @@ -54,6 +54,7 @@ class ReplicationSendEventRestServlet(ReplicationEndpoint): self.event_creation_handler = hs.get_event_creation_handler() self.store = hs.get_datastore() + self.storage = hs.get_storage() self.clock = hs.get_clock() @staticmethod @@ -100,7 +101,7 @@ class ReplicationSendEventRestServlet(ReplicationEndpoint): event = EventType(event_dict, internal_metadata, rejected_reason) requester = Requester.deserialize(self.store, content["requester"]) - context = EventContext.deserialize(self.store, content["context"]) + context = EventContext.deserialize(self.storage, content["context"]) ratelimit = content["ratelimit"] extra_users = [UserID.from_string(u) for u in content["extra_users"]] |