chore: fix clock util import path

synapse_invite_checker/invite_checker.py

@@ -270,7 +270,7 @@ def __init__(self, config: InviteCheckerConfig, api: ModuleApi):
             ).register(self.resource)
             self.api.register_web_resource(INFO_API_PREFIX, self.resource)
 
-        self.api._hs._reactor.callWhenRunning(self.after_startup)
+        self.api._clock.call_when_running(self.after_startup)
 
         logger.info("Module initialized at %s", BASE_API_PREFIX)
 

tests/base.py

@@ -38,7 +38,7 @@
 )
 from synapse.server import HomeServer
 from synapse.types import UserID, create_requester
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from twisted.internet.testing import MemoryReactor
 from typing_extensions import override
 

tests/server.py

@@ -42,7 +42,7 @@
 from synapse.storage.database import LoggingDatabaseConnection, make_pool
 from synapse.storage.engines import BaseDatabaseEngine, create_engine
 from synapse.types import ISynapseReactor, JsonDict
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from twisted.enterprise import adbapi
 from twisted.internet import address, tcp, threads, udp
 from twisted.internet._resolver import SimpleResolverComplexifier

tests/test_createrooms_local.py

@@ -18,7 +18,7 @@
 from parameterized import parameterized
 from synapse.api.constants import EventTypes, HistoryVisibility, JoinRules
 from synapse.server import HomeServer
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from twisted.internet.testing import MemoryReactor
 
 from tests.base import FederatingModuleApiTestCase

tests/test_createrooms_remote.py

@@ -16,7 +16,7 @@
 
 from parameterized import parameterized
 from synapse.server import HomeServer
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from twisted.internet.testing import MemoryReactor
 
 from tests.base import FederatingModuleApiTestCase

tests/test_local_invites.py

@@ -17,7 +17,7 @@
 
 from parameterized import parameterized
 from synapse.server import HomeServer
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from twisted.internet.testing import MemoryReactor
 
 from synapse_invite_checker.types import PermissionConfig, PermissionDefaultSetting

tests/test_local_joins.py

@@ -17,7 +17,7 @@
 from typing import Any
 
 from synapse.server import HomeServer
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from twisted.internet.testing import MemoryReactor
 
 from tests.base import FederatingModuleApiTestCase

tests/test_permissions.py

@@ -20,7 +20,7 @@
 from parameterized import parameterized_class
 from synapse.api.errors import Codes, HttpResponseException
 from synapse.server import HomeServer
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from twisted.internet.testing import MemoryReactor
 
 from synapse_invite_checker.types import (

tests/test_reactions.py

@@ -19,7 +19,7 @@
 from parameterized import parameterized_class
 from synapse.api.constants import EventTypes, RelationTypes
 from synapse.server import HomeServer
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from twisted.internet.testing import MemoryReactor
 
 from tests.base import FederatingModuleApiTestCase

tests/test_remote_invites.py

@@ -19,7 +19,7 @@
 from synapse.module_api import NOT_SPAM, errors
 from synapse.server import HomeServer
 from synapse.types import UserID
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from twisted.internet import defer
 from twisted.internet.testing import MemoryReactor
 

tests/test_remote_joins.py

@@ -18,7 +18,7 @@
 
 from parameterized import parameterized
 from synapse.server import HomeServer
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from twisted.internet.testing import MemoryReactor
 from typing_extensions import override
 

tests/test_room_message_timestamp.py

@@ -15,7 +15,7 @@
 import logging
 
 from synapse.server import HomeServer
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from twisted.internet.testing import MemoryReactor
 
 from tests.base import FederatingModuleApiTestCase

tests/test_room_versions.py

@@ -16,7 +16,7 @@
 
 from parameterized import parameterized
 from synapse.server import HomeServer
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from twisted.internet.testing import MemoryReactor
 
 from tests.base import FederatingModuleApiTestCase, construct_extra_content

tests/test_scheduled_tasks.py

@@ -23,7 +23,7 @@
 from synapse.handlers.pagination import SHUTDOWN_AND_PURGE_ROOM_ACTION_NAME
 from synapse.server import HomeServer
 from synapse.types import TaskStatus, UserID
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from twisted.internet.testing import MemoryReactor
 
 from tests.base import FederatingModuleApiTestCase

tests/test_tim_federation.py

@@ -15,7 +15,7 @@
 from unittest.mock import AsyncMock, patch
 
 from synapse.server import HomeServer
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from twisted.internet.testing import MemoryReactor
 
 from synapse_invite_checker.types import FederationDomain

tests/test_tim_information.py

@@ -15,7 +15,7 @@
 from http import HTTPStatus
 
 from synapse.server import HomeServer
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from twisted.internet.testing import MemoryReactor
 
 import tests.unittest as synapse_test

tests/test_utils/fake_room_creation.py

@@ -29,7 +29,8 @@
 from synapse.events import EventBase, make_event_from_dict
 from synapse.federation.federation_client import SendJoinResult
 from synapse.types import RoomID
-from synapse.util import Clock, stringutils
+from synapse.util import stringutils
+from synapse.util.clock import Clock
 
 
 class FakeRoom:

tests/test_utils/oidc.py

@@ -21,7 +21,7 @@
 
 import attr
 from synapse.server import HomeServer
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from synapse.util.stringutils import random_string
 from twisted.web.http_headers import Headers
 

tests/unittest.py

@@ -50,7 +50,7 @@
 from synapse.server import HomeServer
 from synapse.storage.keys import FetchKeyResult
 from synapse.types import JsonDict, Requester, UserID, create_requester
-from synapse.util import Clock
+from synapse.util.clock import Clock
 from synapse.util.httpresourcetree import create_resource_tree
 from twisted.internet.defer import Deferred, ensureDeferred
 from twisted.internet.testing import MemoryReactor, MemoryReactorClock