From 2db3b18ce8b2819102bba45c01a2da639a74e3ae Mon Sep 17 00:00:00 2001 From: Stephen D Date: Sun, 25 Aug 2024 14:55:52 -0300 Subject: [PATCH] Clean up existing code in get_server_keys_from_cache. It's a little DRYer now --- src/service/rooms/event_handler.rs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/service/rooms/event_handler.rs b/src/service/rooms/event_handler.rs index 1970ea3e..0e46d524 100644 --- a/src/service/rooms/event_handler.rs +++ b/src/service/rooms/event_handler.rs @@ -1669,15 +1669,8 @@ impl Service { let contains_all_ids = |keys: &SigningKeys| { signature_ids.iter().all(|id| { - keys.verify_keys - .keys() - .map(ToString::to_string) - .any(|key_id| id == &key_id) - || keys - .old_verify_keys - .keys() - .map(ToString::to_string) - .any(|key_id| id == &key_id) + keys.verify_keys.contains_key(id) + || keys.old_verify_keys.contains_key(id) }) };