|
@@ -14,6 +14,8 @@
|
|
|
|
|
|
import logging
|
|
|
|
|
|
+from frozendict import frozendict
|
|
|
+
|
|
|
from synapse.api.constants import EventTypes, Membership
|
|
|
from synapse.api.room_versions import RoomVersions
|
|
|
from synapse.storage.state import StateFilter
|
|
@@ -183,7 +185,9 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.storage.state.get_state_for_event(
|
|
|
e5.event_id,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: {self.u_alice.to_string()}},
|
|
|
+ types=frozendict(
|
|
|
+ {EventTypes.Member: frozenset({self.u_alice.to_string()})}
|
|
|
+ ),
|
|
|
include_others=True,
|
|
|
),
|
|
|
)
|
|
@@ -203,7 +207,8 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.storage.state.get_state_for_event(
|
|
|
e5.event_id,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: set()}, include_others=True
|
|
|
+ types=frozendict({EventTypes.Member: frozenset()}),
|
|
|
+ include_others=True,
|
|
|
),
|
|
|
)
|
|
|
)
|
|
@@ -228,7 +233,7 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.state_datastore._state_group_cache,
|
|
|
group,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: set()}, include_others=True
|
|
|
+ types=frozendict({EventTypes.Member: frozenset()}), include_others=True
|
|
|
),
|
|
|
)
|
|
|
|
|
@@ -245,7 +250,7 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.state_datastore._state_group_members_cache,
|
|
|
group,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: set()}, include_others=True
|
|
|
+ types=frozendict({EventTypes.Member: frozenset()}), include_others=True
|
|
|
),
|
|
|
)
|
|
|
|
|
@@ -258,7 +263,7 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.state_datastore._state_group_cache,
|
|
|
group,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: None}, include_others=True
|
|
|
+ types=frozendict({EventTypes.Member: None}), include_others=True
|
|
|
),
|
|
|
)
|
|
|
|
|
@@ -275,7 +280,7 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.state_datastore._state_group_members_cache,
|
|
|
group,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: None}, include_others=True
|
|
|
+ types=frozendict({EventTypes.Member: None}), include_others=True
|
|
|
),
|
|
|
)
|
|
|
|
|
@@ -295,7 +300,8 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.state_datastore._state_group_cache,
|
|
|
group,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: {e5.state_key}}, include_others=True
|
|
|
+ types=frozendict({EventTypes.Member: frozenset({e5.state_key})}),
|
|
|
+ include_others=True,
|
|
|
),
|
|
|
)
|
|
|
|
|
@@ -312,7 +318,8 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.state_datastore._state_group_members_cache,
|
|
|
group,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: {e5.state_key}}, include_others=True
|
|
|
+ types=frozendict({EventTypes.Member: frozenset({e5.state_key})}),
|
|
|
+ include_others=True,
|
|
|
),
|
|
|
)
|
|
|
|
|
@@ -325,7 +332,8 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.state_datastore._state_group_members_cache,
|
|
|
group,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: {e5.state_key}}, include_others=False
|
|
|
+ types=frozendict({EventTypes.Member: frozenset({e5.state_key})}),
|
|
|
+ include_others=False,
|
|
|
),
|
|
|
)
|
|
|
|
|
@@ -375,7 +383,7 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.state_datastore._state_group_cache,
|
|
|
group,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: set()}, include_others=True
|
|
|
+ types=frozendict({EventTypes.Member: frozenset()}), include_others=True
|
|
|
),
|
|
|
)
|
|
|
|
|
@@ -387,7 +395,7 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.state_datastore._state_group_members_cache,
|
|
|
group,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: set()}, include_others=True
|
|
|
+ types=frozendict({EventTypes.Member: frozenset()}), include_others=True
|
|
|
),
|
|
|
)
|
|
|
|
|
@@ -400,7 +408,7 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.state_datastore._state_group_cache,
|
|
|
group,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: None}, include_others=True
|
|
|
+ types=frozendict({EventTypes.Member: None}), include_others=True
|
|
|
),
|
|
|
)
|
|
|
|
|
@@ -411,7 +419,7 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.state_datastore._state_group_members_cache,
|
|
|
group,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: None}, include_others=True
|
|
|
+ types=frozendict({EventTypes.Member: None}), include_others=True
|
|
|
),
|
|
|
)
|
|
|
|
|
@@ -430,7 +438,8 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.state_datastore._state_group_cache,
|
|
|
group,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: {e5.state_key}}, include_others=True
|
|
|
+ types=frozendict({EventTypes.Member: frozenset({e5.state_key})}),
|
|
|
+ include_others=True,
|
|
|
),
|
|
|
)
|
|
|
|
|
@@ -441,7 +450,8 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.state_datastore._state_group_members_cache,
|
|
|
group,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: {e5.state_key}}, include_others=True
|
|
|
+ types=frozendict({EventTypes.Member: frozenset({e5.state_key})}),
|
|
|
+ include_others=True,
|
|
|
),
|
|
|
)
|
|
|
|
|
@@ -454,7 +464,8 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.state_datastore._state_group_cache,
|
|
|
group,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: {e5.state_key}}, include_others=False
|
|
|
+ types=frozendict({EventTypes.Member: frozenset({e5.state_key})}),
|
|
|
+ include_others=False,
|
|
|
),
|
|
|
)
|
|
|
|
|
@@ -465,7 +476,8 @@ class StateStoreTestCase(HomeserverTestCase):
|
|
|
self.state_datastore._state_group_members_cache,
|
|
|
group,
|
|
|
state_filter=StateFilter(
|
|
|
- types={EventTypes.Member: {e5.state_key}}, include_others=False
|
|
|
+ types=frozendict({EventTypes.Member: frozenset({e5.state_key})}),
|
|
|
+ include_others=False,
|
|
|
),
|
|
|
)
|
|
|
|