Fix typechecks against twisted trunk (#13061)

matrix-org · Jun 15, 2022 · a4ae140 · a4ae140
1 parent bd03332
commit a4ae140
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/changelog.d/13061.misc b/changelog.d/13061.misc
@@ -0,0 +1 @@
+Fix type checking errors against Twisted trunk.
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
@@ -119,7 +119,7 @@ def test_rejected_message_event_state(self) -> None:
         join_event = self._build_and_send_join_event(OTHER_SERVER, OTHER_USER, room_id)
 
         # check the state group
-        sg = self.successResultOf(
+        sg = self.get_success(
             self.store._get_state_group_for_event(join_event.event_id)
         )
 
@@ -149,7 +149,7 @@ def test_rejected_message_event_state(self) -> None:
         self.assertIsNotNone(e.rejected_reason)
 
         # ... and the state group should be the same as before
-        sg2 = self.successResultOf(self.store._get_state_group_for_event(ev.event_id))
+        sg2 = self.get_success(self.store._get_state_group_for_event(ev.event_id))
 
         self.assertEqual(sg, sg2)
 
@@ -172,7 +172,7 @@ def test_rejected_state_event_state(self) -> None:
         join_event = self._build_and_send_join_event(OTHER_SERVER, OTHER_USER, room_id)
 
         # check the state group
-        sg = self.successResultOf(
+        sg = self.get_success(
             self.store._get_state_group_for_event(join_event.event_id)
         )
 
@@ -203,7 +203,7 @@ def test_rejected_state_event_state(self) -> None:
         self.assertIsNotNone(e.rejected_reason)
 
         # ... and the state group should be the same as before
-        sg2 = self.successResultOf(self.store._get_state_group_for_event(ev.event_id))
+        sg2 = self.get_success(self.store._get_state_group_for_event(ev.event_id))
 
         self.assertEqual(sg, sg2)
 

diff --git a/tests/state/test_v2.py b/tests/state/test_v2.py
@@ -495,6 +495,7 @@ def do_check(
 
             prev_events = list(graph[node_id])
 
+            state_before: StateMap[str]
             if len(prev_events) == 0:
                 state_before = {}
             elif len(prev_events) == 1:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix type checking errors against Twisted trunk.