Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Add type hints and comments to some event auth code. #10393

Merged
merged 2 commits into from
Jul 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/10393.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add type hints and comments to event auth code.
1 change: 1 addition & 0 deletions mypy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ files =
synapse/util/stringutils.py,
synapse/visibility.py,
tests/replication,
tests/test_event_auth.py,
tests/test_utils,
tests/handlers/test_password_providers.py,
tests/rest/client/v1/test_login.py,
Expand Down
3 changes: 3 additions & 0 deletions synapse/event_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ def check(
room_version_obj: the version of the room
event: the event being checked.
auth_events: the existing room state.
do_sig_check: True if it should be verified that the sending server
signed the event.
do_size_check: True if the size of the event fields should be verified.

Raises:
AuthError if the checks fail
Expand Down
23 changes: 13 additions & 10 deletions tests/test_event_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
# limitations under the License.

import unittest
from typing import Optional

from synapse import event_auth
from synapse.api.errors import AuthError
from synapse.api.room_versions import RoomVersions
from synapse.events import make_event_from_dict
from synapse.types import get_domain_from_id
from synapse.events import EventBase, make_event_from_dict
from synapse.types import JsonDict, get_domain_from_id


class EventAuthTestCase(unittest.TestCase):
Expand Down Expand Up @@ -432,7 +433,7 @@ def test_join_rules_msc3083_restricted(self):
TEST_ROOM_ID = "!test:room"


def _create_event(user_id):
def _create_event(user_id: str) -> EventBase:
return make_event_from_dict(
{
"room_id": TEST_ROOM_ID,
Expand All @@ -444,7 +445,9 @@ def _create_event(user_id):
)


def _member_event(user_id, membership, sender=None):
def _member_event(
user_id: str, membership: str, sender: Optional[str] = None
) -> EventBase:
return make_event_from_dict(
{
"room_id": TEST_ROOM_ID,
Expand All @@ -458,11 +461,11 @@ def _member_event(user_id, membership, sender=None):
)


def _join_event(user_id):
def _join_event(user_id: str) -> EventBase:
return _member_event(user_id, "join")


def _power_levels_event(sender, content):
def _power_levels_event(sender: str, content: JsonDict) -> EventBase:
return make_event_from_dict(
{
"room_id": TEST_ROOM_ID,
Expand All @@ -475,7 +478,7 @@ def _power_levels_event(sender, content):
)


def _alias_event(sender, **kwargs):
def _alias_event(sender: str, **kwargs) -> EventBase:
data = {
"room_id": TEST_ROOM_ID,
"event_id": _get_event_id(),
Expand All @@ -488,7 +491,7 @@ def _alias_event(sender, **kwargs):
return make_event_from_dict(data)


def _random_state_event(sender):
def _random_state_event(sender: str) -> EventBase:
return make_event_from_dict(
{
"room_id": TEST_ROOM_ID,
Expand All @@ -501,7 +504,7 @@ def _random_state_event(sender):
)


def _join_rules_event(sender, join_rule):
def _join_rules_event(sender: str, join_rule: str) -> EventBase:
return make_event_from_dict(
{
"room_id": TEST_ROOM_ID,
Expand All @@ -519,7 +522,7 @@ def _join_rules_event(sender, join_rule):
event_count = 0


def _get_event_id():
def _get_event_id() -> str:
global event_count
c = event_count
event_count += 1
Expand Down