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

Add some clarifying comments and refactor a portion of the Keyring class for readability #14804

Merged
merged 6 commits into from
Jan 13, 2023
Merged

Add some clarifying comments and refactor a portion of the Keyring class for readability #14804

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cacaaa8
Keyring: add some comments and refactor code for readability
anoadragon453 Jan 9, 2023
6a4b75a
changelog
anoadragon453 Jan 9, 2023
d4d322c
Correct some logic that was accidentally changed
anoadragon453 Jan 9, 2023
82560e9
Rename Keyring._server_queue -> Keyring._fetch_keys_queue
anoadragon453 Jan 10, 2023
c5ba64f
Migrate to words in docstrings
anoadragon453 Jan 10, 2023
357eef8
Revert "Correct some logic that was accidentally changed"
anoadragon453 Jan 11, 2023
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
Prev Previous commit
Next Next commit
Correct some logic that was accidentally changed
  • Loading branch information
@anoadragon453
anoadragon453 committed Jan 9, 2023
commit d4d322c7f75c3e3fc40ad8ce78758d4db5c01cfa
2 changes: 1 addition & 1 deletion synapse/crypto/keyring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ async def _inner_fetch_key_request(
# If we already have a result for the given key ID, we keep the
# one with the highest `valid_until_ts`.
existing_key = found_keys.get(key_id)
if existing_key and existing_key.valid_until_ts > key.valid_until_ts:
if existing_key and existing_key.valid_until_ts >= key.valid_until_ts:
continue

# Check if this key's expiry timestamp is valid for the verify request.
Expand Down