Move bridge state to mautrix.util

Author: tulir

Diff for: mautrix/bridge/__init__.py

@@ -9,4 +9,4 @@
 from .bridge import Bridge
 from .notification_disabler import NotificationDisabler
 from .async_getter_lock import async_getter_lock
-from .state import BridgeState
+from mautrix.util.bridge_state import BridgeState

Diff for: mautrix/bridge/e2ee.py

@@ -31,7 +31,7 @@
     Database = None
 
 if TYPE_CHECKING:
-    from mautrix.bridge import Bridge
+    from mautrix.util.bridge_state import Bridge
 
 
 class EncryptionManager:

Diff for: mautrix/bridge/user.py

@@ -15,10 +15,10 @@
 from mautrix.errors import MNotFound
 from mautrix.util.logging import TraceLogger
 from mautrix.util.opt_prometheus import Gauge
+from mautrix.util.bridge_state import BridgeState
 
 from .portal import BasePortal
 from .puppet import BasePuppet
-from .state import BridgeState
 
 if TYPE_CHECKING:
     from .bridge import Bridge

Diff for: mautrix/util/__init__.py

@@ -1,3 +1,3 @@
 __all__ = ["formatter", "logging", "config", "signed_token", "simple_template", "manhole",
            "markdown", "simple_lock", "file_store", "program", "async_db", "db", "opt_prometheus",
-           "color_log", "magic"]
+           "color_log", "magic", "bridge_state"]