Merge branch 'develop' into cross-signing_federation

This commit is contained in:
Hubert Chathi 2019-10-24 22:31:25 -04:00
commit c40d7244f8
350 changed files with 5090 additions and 4592 deletions

View file

@ -24,7 +24,7 @@ from twisted.internet import defer
from synapse.appservice import ApplicationService, ApplicationServiceState
from synapse.config._base import ConfigError
from synapse.storage.appservice import (
from synapse.storage.data_stores.main.appservice import (
ApplicationServiceStore,
ApplicationServiceTransactionStore,
)

View file

@ -50,6 +50,8 @@ class CleanupExtremBackgroundUpdateStoreTestCase(HomeserverTestCase):
schema_path = os.path.join(
prepare_database.dir_path,
"data_stores",
"main",
"schema",
"delta",
"54",

View file

@ -16,7 +16,7 @@
from twisted.internet import defer
from synapse.storage.profile import ProfileStore
from synapse.storage.data_stores.main.profile import ProfileStore
from synapse.types import UserID
from tests import unittest

View file

@ -15,7 +15,7 @@
from twisted.internet import defer
from synapse.storage import UserDirectoryStore
from synapse.storage.data_stores.main.user_directory import UserDirectoryStore
from tests import unittest
from tests.utils import setup_test_homeserver