Fix tests

tests/handlers/test_device.py

@@ -36,7 +36,7 @@ from synapse.api.errors import NotFoundError, SynapseError
 from synapse.api.room_versions import RoomVersions
 from synapse.appservice import ApplicationService
 from synapse.crypto.event_signing import add_hashes_and_signatures
-from synapse.events import EventBase, FrozenEventV3
+from synapse.events import EventBase, make_event_from_dict
 from synapse.federation.federation_client import SendJoinResult
 from synapse.federation.transport.client import (
     StateRequestResponse,
@@ -677,7 +677,7 @@ class DeviceUnPartialStateTestCase(unittest.HomeserverTestCase):
             self.REMOTE1_SERVER_SIGNATURE_KEY,
         )
 
-        create_event = FrozenEventV3(create_event_dict, room_version, {}, None)
+        create_event = make_event_from_dict(create_event_dict, room_version)
         events.append(create_event)
 
         room_version = self.hs.config.server.default_room_version
@@ -700,7 +700,7 @@ class DeviceUnPartialStateTestCase(unittest.HomeserverTestCase):
             self.hs.hostname,
             self.hs.signing_key,
         )
-        join_event = FrozenEventV3(join_event_dict, room_version, {}, None)
+        join_event = make_event_from_dict(join_event_dict, room_version)
         events.append(join_event)
 
         # Then set the join rules to public
@@ -722,7 +722,7 @@ class DeviceUnPartialStateTestCase(unittest.HomeserverTestCase):
             self.REMOTE1_SERVER_NAME,
             self.REMOTE1_SERVER_SIGNATURE_KEY,
         )
-        join_rules_event = FrozenEventV3(join_rules_event_dict, room_version, {}, None)
+        join_rules_event = make_event_from_dict(join_rules_event_dict, room_version)
         events.append(join_rules_event)
 
         return {(event.type, event.state_key): event for event in events}
@@ -733,7 +733,7 @@ class DeviceUnPartialStateTestCase(unittest.HomeserverTestCase):
         user: str,
         signing_key: SigningKey,
         state: StateMap[EventBase],
-    ) -> FrozenEventV3:
+    ) -> EventBase:
         """Build a join event for the local user, signed by the local server."""
 
         latest_event = max(state.values(), key=lambda e: e.depth)
@@ -759,7 +759,7 @@ class DeviceUnPartialStateTestCase(unittest.HomeserverTestCase):
             get_domain_from_id(user),
             signing_key,
         )
-        return FrozenEventV3(join_event_dict, room_version, {}, None)
+        return make_event_from_dict(join_event_dict, room_version)
 
     @parameterized.expand([("not_pruned", False), ("pruned", True)])
     @patch(

tests/module_api/test_api.py

@@ -841,10 +841,10 @@ class ModuleApiTestCase(BaseModuleApiTestCase):
         create_event = state[(EventTypes.Create, "")]
 
         # `.user_id` is a deprecated alias for `.sender`.
-        self.assertEqual(create_event.user_id, user_id)
+        self.assertEqual(create_event.user_id, user_id)  # type: ignore[attr-defined]
 
         # The event supports looking up keys via `__getitem__` although deprecated
-        self.assertEqual(create_event["room_id"], room_id)
+        self.assertEqual(create_event["room_id"], room_id)  # type: ignore[index]
 
 
 class ModuleApiWorkerTestCase(BaseModuleApiTestCase, BaseMultiWorkerStreamTestCase):

tests/push/test_presentable_names.py

@@ -55,6 +55,8 @@ class MockDataStore:
                     "origin_server_ts": i,
                 },
                 RoomVersions.V1,
+                {},
+                None,
             )
 
     async def get_event(self, event_id: str, allow_none: bool = False) -> Event | None:

tests/push/test_push_rule_evaluator.py

@@ -162,6 +162,8 @@ class PushRuleEvaluatorTestCase(unittest.TestCase):
                 "content": content,
             },
             RoomVersions.V1,
+            {},
+            None,
         )
         room_member_count = 0
         sender_power_level = 0

tests/rest/client/test_third_party_rules.py

@@ -236,7 +236,7 @@ class ThirdPartyRulesTestCase(unittest.FederatingHomeserverTestCase):
         async def check(
             ev: EventBase, state: StateMap[EventBase]
         ) -> tuple[bool, JsonDict | None]:
-            ev.content = {"x": "y"}
+            ev.content = {"x": "y"}  # type: ignore[misc]
             return True, None
 
         self.hs.get_module_api_callbacks().third_party_event_rules._check_event_allowed_callbacks = [

tests/storage/test_msc4242_state_dag.py

@@ -19,7 +19,7 @@ from twisted.test.proto_helpers import MemoryReactor
 from synapse.api.constants import EventTypes
 from synapse.api.errors import SynapseError
 from synapse.api.room_versions import RoomVersions
-from synapse.events import EventBase, make_event_from_dict
+from synapse.events import EventBase
 from synapse.events.snapshot import EventContext
 from synapse.rest.client import room
 from synapse.server import HomeServer
@@ -153,20 +153,11 @@ class MSC4242EventPersistenceStateDagsStoreTestCase(HomeserverTestCase):
         prev_state_events: list[str],
         rejected: bool = False,
     ) -> tuple[EventBase, EventContext]:
-        ev = make_event_from_dict(
-            {
-                "prev_state_events": prev_state_events,
-                "content": {
-                    "membership": "join",
-                },
-                "sender": "@unimportant:info",
-                "state_key": "@unimportant:info",
-                "type": "m.room.member",
-                "room_id": self.room_id,
-            },
-            room_version=RoomVersions.MSC4242v12,
-        )
-        ev._event_id = id
+        ev = Mock(spec=EventBase)
+        ev.event_id = id
+        ev.prev_state_events = prev_state_events
+        ev.state_key = "@unimportant:info"
+        ev.is_state.return_value = True
         ctx = Mock()
         ctx.rejected = rejected
         return ev, ctx

tests/storage/test_redaction.py

@@ -26,7 +26,7 @@ from twisted.internet.testing import MemoryReactor
 
 from synapse.api.constants import EventTypes, Membership
 from synapse.api.room_versions import RoomVersion, RoomVersions
-from synapse.events import EventBase
+from synapse.events import EventBase, make_event_from_dict
 from synapse.events.builder import EventBuilder
 from synapse.server import HomeServer
 from synapse.synapse_rust.events import EventInternalMetadata
@@ -238,11 +238,16 @@ class RedactionTestCase(unittest.HomeserverTestCase):
                     prev_event_ids=prev_event_ids, auth_event_ids=auth_event_ids
                 )
 
-                built_event._event_id = self._event_id  # type: ignore[attr-defined]
-                built_event._dict["event_id"] = self._event_id
-                assert built_event.event_id == self._event_id
+                event_dict = built_event.get_dict()
+                event_dict["event_id"] = self._event_id
+                rebuilt_event = make_event_from_dict(
+                    event_dict,
+                    room_version=built_event.room_version,
+                    internal_metadata_dict=built_event.internal_metadata.get_dict(),
+                )
+                assert rebuilt_event.event_id == self._event_id
 
-                return built_event
+                return rebuilt_event
 
             @property
             def room_id(self) -> str:

tests/test_event_auth.py

@@ -92,8 +92,8 @@ class EventAuthTestCase(unittest.TestCase):
             RoomVersions.V9,
             creator,
             "public",
+            rejected_reason="stinky",
         )
-        rejected_join_rules.rejected_reason = "stinky"
         auth_events.append(rejected_join_rules)
         event_store.add_event(rejected_join_rules)
 
@@ -1179,7 +1179,10 @@ def _random_state_event(
 
 
 def _join_rules_event(
-    room_version: RoomVersion, sender: str, join_rule: str
+    room_version: RoomVersion,
+    sender: str,
+    join_rule: str,
+    rejected_reason: str | None = None,
 ) -> EventBase:
     return make_event_from_dict(
         {
@@ -1193,6 +1196,7 @@ def _join_rules_event(
             },
         },
         room_version=room_version,
+        rejected_reason=rejected_reason,
     )