From e9aa40199417e8384a25abdc172afc47ceb8d07e Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Wed, 6 Mar 2019 13:21:32 +0000
Subject: Remove redundant changes from synapse/replication/tcp/streams.py
 (#4813)

This was some hacky code (introduced in c10c71e70d) to make the presence stream
do nothing on hotfixes. We now ensure that no replication clients subscribe to
the presence stream, so this is redundant.
---
 synapse/replication/tcp/streams.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'synapse/replication/tcp/streams.py')

diff --git a/synapse/replication/tcp/streams.py b/synapse/replication/tcp/streams.py
index d49973634e..728746bd12 100644
--- a/synapse/replication/tcp/streams.py
+++ b/synapse/replication/tcp/streams.py
@@ -265,8 +265,8 @@ class PresenceStream(Stream):
         store = hs.get_datastore()
         presence_handler = hs.get_presence_handler()
 
-        self.current_token = lambda: 0
-        self.update_function = lambda _a, _b: []
+        self.current_token = store.get_current_presence_token
+        self.update_function = presence_handler.get_all_presence_updates
 
         super(PresenceStream, self).__init__(hs)
 
-- 
cgit 1.5.1