diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index ed351367cc..ed21defd13 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -34,7 +34,7 @@ class FederationTestCase(unittest.TestCase):
self.mock_config.signing_key = [MockKey()]
self.state_handler = NonCallableMock(spec_set=[
- "annotate_context_with_state",
+ "compute_event_context",
])
self.auth = NonCallableMock(spec_set=[
@@ -91,11 +91,12 @@ class FederationTestCase(unittest.TestCase):
self.datastore.get_room.return_value = defer.succeed(True)
self.auth.check_host_in_room.return_value = defer.succeed(True)
- def annotate(ev, context, old_state=None):
+ def annotate(ev, old_state=None):
+ context = Mock()
context.current_state = {}
context.auth_events = {}
- return defer.succeed(False)
- self.state_handler.annotate_context_with_state.side_effect = annotate
+ return defer.succeed(context)
+ self.state_handler.compute_event_context.side_effect = annotate
yield self.handlers.federation_handler.on_receive_pdu(
"fo", pdu, False
@@ -109,15 +110,12 @@ class FederationTestCase(unittest.TestCase):
context=ANY,
)
- self.state_handler.annotate_context_with_state.assert_called_once_with(
- ANY,
- ANY,
- old_state=None,
+ self.state_handler.compute_event_context.assert_called_once_with(
+ ANY, old_state=None,
)
self.auth.check.assert_called_once_with(ANY, auth_events={})
self.notifier.on_new_room_event.assert_called_once_with(
- ANY,
- extra_users=[]
+ ANY, extra_users=[]
)
diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py
index 83493cae20..0cb8aa4fbc 100644
--- a/tests/handlers/test_room.py
+++ b/tests/handlers/test_room.py
@@ -60,7 +60,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
"check_host_in_room",
]),
state_handler=NonCallableMock(spec_set=[
- "annotate_context_with_state",
+ "compute_event_context",
"get_current_state",
]),
config=self.mock_config,
@@ -110,7 +110,8 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
defer.succeed([])
)
- def annotate(_, ctx):
+ def annotate(_):
+ ctx = Mock()
ctx.current_state = {
(EventTypes.Member, "@alice:green"): self._create_member(
user_id="@alice:green",
@@ -121,10 +122,11 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
room_id=room_id,
),
}
+ ctx.prev_state_events = []
- return defer.succeed(True)
+ return defer.succeed(ctx)
- self.state_handler.annotate_context_with_state.side_effect = annotate
+ self.state_handler.compute_event_context.side_effect = annotate
def add_auth(_, ctx):
ctx.auth_events = ctx.current_state[
@@ -146,8 +148,8 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
yield room_handler.change_membership(event, context)
- self.state_handler.annotate_context_with_state.assert_called_once_with(
- builder, context
+ self.state_handler.compute_event_context.assert_called_once_with(
+ builder
)
self.auth.add_auth_events.assert_called_once_with(
@@ -189,7 +191,8 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
defer.succeed([])
)
- def annotate(_, ctx):
+ def annotate(_):
+ ctx = Mock()
ctx.current_state = {
(EventTypes.Member, "@bob:red"): self._create_member(
user_id="@bob:red",
@@ -197,10 +200,11 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
membership=Membership.INVITE
),
}
+ ctx.prev_state_events = []
- return defer.succeed(True)
+ return defer.succeed(ctx)
- self.state_handler.annotate_context_with_state.side_effect = annotate
+ self.state_handler.compute_event_context.side_effect = annotate
def add_auth(_, ctx):
ctx.auth_events = ctx.current_state[
@@ -262,7 +266,8 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
defer.succeed([])
)
- def annotate(_, ctx):
+ def annotate(_):
+ ctx = Mock()
ctx.current_state = {
(EventTypes.Member, "@bob:red"): self._create_member(
user_id="@bob:red",
@@ -270,10 +275,11 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
membership=Membership.JOIN
),
}
+ ctx.prev_state_events = []
- return defer.succeed(True)
+ return defer.succeed(ctx)
- self.state_handler.annotate_context_with_state.side_effect = annotate
+ self.state_handler.compute_event_context.side_effect = annotate
def add_auth(_, ctx):
ctx.auth_events = ctx.current_state[
diff --git a/tests/test_state.py b/tests/test_state.py
index 7979b54a35..98ad9e54cd 100644
--- a/tests/test_state.py
+++ b/tests/test_state.py
@@ -26,6 +26,7 @@ class StateTestCase(unittest.TestCase):
self.store = Mock(
spec_set=[
"get_state_groups",
+ "add_event_hashes",
]
)
hs = Mock(spec=["get_datastore"])
@@ -44,17 +45,20 @@ class StateTestCase(unittest.TestCase):
self.create_event(type="test2", state_key=""),
]
- yield self.state.annotate_event_with_state(event, old_state=old_state)
+ context = yield self.state.compute_event_context(
+ event, old_state=old_state
+ )
- for k, v in event.old_state_events.items():
+ for k, v in context.current_state.items():
type, state_key = k
self.assertEqual(type, v.type)
self.assertEqual(state_key, v.state_key)
- self.assertEqual(set(old_state), set(event.old_state_events.values()))
- self.assertDictEqual(event.old_state_events, event.state_events)
+ self.assertEqual(
+ set(old_state), set(context.current_state.values())
+ )
- self.assertIsNone(event.state_group)
+ self.assertIsNone(context.state_group)
@defer.inlineCallbacks
def test_annotate_with_old_state(self):
@@ -66,21 +70,21 @@ class StateTestCase(unittest.TestCase):
self.create_event(type="test2", state_key=""),
]
- yield self.state.annotate_event_with_state(event, old_state=old_state)
+ context = yield self.state.compute_event_context(
+ event, old_state=old_state
+ )
- for k, v in event.old_state_events.items():
+ for k, v in context.current_state.items():
type, state_key = k
self.assertEqual(type, v.type)
self.assertEqual(state_key, v.state_key)
self.assertEqual(
- set(old_state + [event]),
- set(event.old_state_events.values())
+ set(old_state),
+ set(context.current_state.values())
)
- self.assertDictEqual(event.old_state_events, event.state_events)
-
- self.assertIsNone(event.state_group)
+ self.assertIsNone(context.state_group)
@defer.inlineCallbacks
def test_trivial_annotate_message(self):
@@ -99,30 +103,19 @@ class StateTestCase(unittest.TestCase):
group_name: old_state,
}
- yield self.state.annotate_event_with_state(event)
+ context = yield self.state.compute_event_context(event)
- for k, v in event.old_state_events.items():
+ for k, v in context.current_state.items():
type, state_key = k
self.assertEqual(type, v.type)
self.assertEqual(state_key, v.state_key)
self.assertEqual(
set([e.event_id for e in old_state]),
- set([e.event_id for e in event.old_state_events.values()])
+ set([e.event_id for e in context.current_state.values()])
)
- self.assertDictEqual(
- {
- k: v.event_id
- for k, v in event.old_state_events.items()
- },
- {
- k: v.event_id
- for k, v in event.state_events.items()
- }
- )
-
- self.assertEqual(group_name, event.state_group)
+ self.assertEqual(group_name, context.state_group)
@defer.inlineCallbacks
def test_trivial_annotate_state(self):
@@ -141,38 +134,19 @@ class StateTestCase(unittest.TestCase):
group_name: old_state,
}
- yield self.state.annotate_event_with_state(event)
+ context = yield self.state.compute_event_context(event)
- for k, v in event.old_state_events.items():
+ for k, v in context.current_state.items():
type, state_key = k
self.assertEqual(type, v.type)
self.assertEqual(state_key, v.state_key)
self.assertEqual(
set([e.event_id for e in old_state]),
- set([e.event_id for e in event.old_state_events.values()])
- )
-
- self.assertEqual(
- set([e.event_id for e in old_state] + [event.event_id]),
- set([e.event_id for e in event.state_events.values()])
- )
-
- new_state = {
- k: v.event_id
- for k, v in event.state_events.items()
- }
- old_state = {
- k: v.event_id
- for k, v in event.old_state_events.items()
- }
- old_state[(event.type, event.state_key)] = event.event_id
- self.assertDictEqual(
- old_state,
- new_state
+ set([e.event_id for e in context.current_state.values()])
)
- self.assertIsNone(event.state_group)
+ self.assertIsNone(context.state_group)
@defer.inlineCallbacks
def test_resolve_message_conflict(self):
@@ -199,16 +173,11 @@ class StateTestCase(unittest.TestCase):
group_name_2: old_state_2,
}
- yield self.state.annotate_event_with_state(event)
+ context = yield self.state.compute_event_context(event)
- self.assertEqual(len(event.old_state_events), 5)
-
- self.assertEqual(
- set([e.event_id for e in event.state_events.values()]),
- set([e.event_id for e in event.old_state_events.values()])
- )
+ self.assertEqual(len(context.current_state), 5)
- self.assertIsNone(event.state_group)
+ self.assertIsNone(context.state_group)
@defer.inlineCallbacks
def test_resolve_state_conflict(self):
@@ -235,19 +204,11 @@ class StateTestCase(unittest.TestCase):
group_name_2: old_state_2,
}
- yield self.state.annotate_event_with_state(event)
+ context = yield self.state.compute_event_context(event)
- self.assertEqual(len(event.old_state_events), 5)
+ self.assertEqual(len(context.current_state), 5)
- expected_new = event.old_state_events
- expected_new[(event.type, event.state_key)] = event
-
- self.assertEqual(
- set([e.event_id for e in expected_new.values()]),
- set([e.event_id for e in event.state_events.values()]),
- )
-
- self.assertIsNone(event.state_group)
+ self.assertIsNone(context.state_group)
def create_event(self, name=None, type=None, state_key=None):
self.event_id += 1
@@ -266,6 +227,9 @@ class StateTestCase(unittest.TestCase):
event.state_key = state_key
event.event_id = event_id
+ event.is_state = lambda: (state_key is not None)
+ event.unsigned = {}
+
event.user_id = "@user_id:example.com"
event.room_id = "!room_id:example.com"
|
