From edbeed06ca83a5420fd7337cf954bc29a443d00c Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 6 Apr 2018 10:20:50 +0100
Subject: Fix MRO for replication stores

---
 synapse/app/appservice.py    | 2 +-
 synapse/app/client_reader.py | 2 +-
 synapse/app/synchrotron.py   | 2 +-
 synapse/app/user_dir.py      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'synapse')

diff --git a/synapse/app/appservice.py b/synapse/app/appservice.py
index f2540023a7..0da35750b0 100644
--- a/synapse/app/appservice.py
+++ b/synapse/app/appservice.py
@@ -42,7 +42,7 @@ logger = logging.getLogger("synapse.app.appservice")
 
 
 class AppserviceSlaveStore(
-    DirectoryStore, SlavedEventStore, SlavedApplicationServiceStore,
+    DirectoryStore, SlavedApplicationServiceStore, SlavedEventStore,
     SlavedRegistrationStore,
 ):
     pass
diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py
index 267d34c881..e28a6edaa7 100644
--- a/synapse/app/client_reader.py
+++ b/synapse/app/client_reader.py
@@ -50,11 +50,11 @@ logger = logging.getLogger("synapse.app.client_reader")
 
 
 class ClientReaderSlavedStore(
+    SlavedApplicationServiceStore,
     SlavedEventStore,
     SlavedKeyStore,
     RoomStore,
     DirectoryStore,
-    SlavedApplicationServiceStore,
     SlavedRegistrationStore,
     TransactionStore,
     SlavedClientIpStore,
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py
index 508b66613d..a16313f3f7 100644
--- a/synapse/app/synchrotron.py
+++ b/synapse/app/synchrotron.py
@@ -64,6 +64,7 @@ logger = logging.getLogger("synapse.app.synchrotron")
 class SynchrotronSlavedStore(
     SlavedReceiptsStore,
     SlavedAccountDataStore,
+    SlavedPushRuleStore,
     SlavedApplicationServiceStore,
     SlavedRegistrationStore,
     SlavedFilteringStore,
@@ -71,7 +72,6 @@ class SynchrotronSlavedStore(
     SlavedGroupServerStore,
     SlavedDeviceInboxStore,
     SlavedDeviceStore,
-    SlavedPushRuleStore,
     SlavedEventStore,
     SlavedClientIpStore,
     RoomStore,
diff --git a/synapse/app/user_dir.py b/synapse/app/user_dir.py
index 5f845e80d1..6fe9c44815 100644
--- a/synapse/app/user_dir.py
+++ b/synapse/app/user_dir.py
@@ -49,8 +49,8 @@ logger = logging.getLogger("synapse.app.user_dir")
 
 
 class UserDirectorySlaveStore(
-    SlavedEventStore,
     SlavedApplicationServiceStore,
+    SlavedEventStore,
     SlavedRegistrationStore,
     SlavedClientIpStore,
     UserDirectoryStore,
-- 
cgit 1.4.1