Use immutabledict instead of frozendict (#15113)

Additionally:

* Consistently use `freeze()` in test

---------

Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
David Robertson 2023-03-22 17:15:34 +00:00 committed by GitHub
parent cabe4a3005
commit 3b0083c92a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 123 additions and 243 deletions

View file

@ -14,7 +14,7 @@
import logging
from frozendict import frozendict
from immutabledict import immutabledict
from twisted.test.proto_helpers import MemoryReactor
@ -198,7 +198,7 @@ class StateStoreTestCase(HomeserverTestCase):
self.storage.state.get_state_for_event(
e5.event_id,
state_filter=StateFilter(
types=frozendict(
types=immutabledict(
{EventTypes.Member: frozenset({self.u_alice.to_string()})}
),
include_others=True,
@ -220,7 +220,7 @@ class StateStoreTestCase(HomeserverTestCase):
self.storage.state.get_state_for_event(
e5.event_id,
state_filter=StateFilter(
types=frozendict({EventTypes.Member: frozenset()}),
types=immutabledict({EventTypes.Member: frozenset()}),
include_others=True,
),
)
@ -246,7 +246,8 @@ class StateStoreTestCase(HomeserverTestCase):
self.state_datastore._state_group_cache,
group,
state_filter=StateFilter(
types=frozendict({EventTypes.Member: frozenset()}), include_others=True
types=immutabledict({EventTypes.Member: frozenset()}),
include_others=True,
),
)
@ -263,7 +264,8 @@ class StateStoreTestCase(HomeserverTestCase):
self.state_datastore._state_group_members_cache,
group,
state_filter=StateFilter(
types=frozendict({EventTypes.Member: frozenset()}), include_others=True
types=immutabledict({EventTypes.Member: frozenset()}),
include_others=True,
),
)
@ -276,7 +278,7 @@ class StateStoreTestCase(HomeserverTestCase):
self.state_datastore._state_group_cache,
group,
state_filter=StateFilter(
types=frozendict({EventTypes.Member: None}), include_others=True
types=immutabledict({EventTypes.Member: None}), include_others=True
),
)
@ -293,7 +295,7 @@ class StateStoreTestCase(HomeserverTestCase):
self.state_datastore._state_group_members_cache,
group,
state_filter=StateFilter(
types=frozendict({EventTypes.Member: None}), include_others=True
types=immutabledict({EventTypes.Member: None}), include_others=True
),
)
@ -313,7 +315,7 @@ class StateStoreTestCase(HomeserverTestCase):
self.state_datastore._state_group_cache,
group,
state_filter=StateFilter(
types=frozendict({EventTypes.Member: frozenset({e5.state_key})}),
types=immutabledict({EventTypes.Member: frozenset({e5.state_key})}),
include_others=True,
),
)
@ -331,7 +333,7 @@ class StateStoreTestCase(HomeserverTestCase):
self.state_datastore._state_group_members_cache,
group,
state_filter=StateFilter(
types=frozendict({EventTypes.Member: frozenset({e5.state_key})}),
types=immutabledict({EventTypes.Member: frozenset({e5.state_key})}),
include_others=True,
),
)
@ -345,7 +347,7 @@ class StateStoreTestCase(HomeserverTestCase):
self.state_datastore._state_group_members_cache,
group,
state_filter=StateFilter(
types=frozendict({EventTypes.Member: frozenset({e5.state_key})}),
types=immutabledict({EventTypes.Member: frozenset({e5.state_key})}),
include_others=False,
),
)
@ -396,7 +398,8 @@ class StateStoreTestCase(HomeserverTestCase):
self.state_datastore._state_group_cache,
group,
state_filter=StateFilter(
types=frozendict({EventTypes.Member: frozenset()}), include_others=True
types=immutabledict({EventTypes.Member: frozenset()}),
include_others=True,
),
)
@ -408,7 +411,8 @@ class StateStoreTestCase(HomeserverTestCase):
self.state_datastore._state_group_members_cache,
group,
state_filter=StateFilter(
types=frozendict({EventTypes.Member: frozenset()}), include_others=True
types=immutabledict({EventTypes.Member: frozenset()}),
include_others=True,
),
)
@ -421,7 +425,7 @@ class StateStoreTestCase(HomeserverTestCase):
self.state_datastore._state_group_cache,
group,
state_filter=StateFilter(
types=frozendict({EventTypes.Member: None}), include_others=True
types=immutabledict({EventTypes.Member: None}), include_others=True
),
)
@ -432,7 +436,7 @@ class StateStoreTestCase(HomeserverTestCase):
self.state_datastore._state_group_members_cache,
group,
state_filter=StateFilter(
types=frozendict({EventTypes.Member: None}), include_others=True
types=immutabledict({EventTypes.Member: None}), include_others=True
),
)
@ -451,7 +455,7 @@ class StateStoreTestCase(HomeserverTestCase):
self.state_datastore._state_group_cache,
group,
state_filter=StateFilter(
types=frozendict({EventTypes.Member: frozenset({e5.state_key})}),
types=immutabledict({EventTypes.Member: frozenset({e5.state_key})}),
include_others=True,
),
)
@ -463,7 +467,7 @@ class StateStoreTestCase(HomeserverTestCase):
self.state_datastore._state_group_members_cache,
group,
state_filter=StateFilter(
types=frozendict({EventTypes.Member: frozenset({e5.state_key})}),
types=immutabledict({EventTypes.Member: frozenset({e5.state_key})}),
include_others=True,
),
)
@ -477,7 +481,7 @@ class StateStoreTestCase(HomeserverTestCase):
self.state_datastore._state_group_cache,
group,
state_filter=StateFilter(
types=frozendict({EventTypes.Member: frozenset({e5.state_key})}),
types=immutabledict({EventTypes.Member: frozenset({e5.state_key})}),
include_others=False,
),
)
@ -489,7 +493,7 @@ class StateStoreTestCase(HomeserverTestCase):
self.state_datastore._state_group_members_cache,
group,
state_filter=StateFilter(
types=frozendict({EventTypes.Member: frozenset({e5.state_key})}),
types=immutabledict({EventTypes.Member: frozenset({e5.state_key})}),
include_others=False,
),
)