backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-18 00:01:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unused parameter

Browse source 
… of filter_keys_server_map and filter_keys_single_server.
This commit is contained in:
Olivia Lee 2025-08-09 00:13:10 +02:00 • committed by Jonas Platte
parent d87848b9a6
commit 6bf289a714
No known key found for this signature in database
GPG key ID: 7D261D771D915378
3 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/api/client_server/membership.rs
View file

@ -1250,11 +1250,9 @@ async fn validate_and_add_event_id(
let unfiltered_keys = (*pub_key_map.read().await).clone(); let unfiltered_keys = (*pub_key_map.read().await).clone();
let keys = services().globals.filter_keys_server_map( let keys = services()
unfiltered_keys, .globals
origin_server_ts, .filter_keys_server_map(unfiltered_keys, origin_server_ts);
room_version,
);
if let Err(error) = if let Err(error) =
ruma::signatures::verify_event(&keys, &value, room_version) ruma::signatures::verify_event(&keys, &value, room_version)

4
src/service/globals.rs
View file

@ -573,11 +573,10 @@ impl Service {
&self, &self,
keys: BTreeMap<String, SigningKeys>, keys: BTreeMap<String, SigningKeys>,
timestamp: MilliSecondsSinceUnixEpoch, timestamp: MilliSecondsSinceUnixEpoch,
room_version_id: &RoomVersionId,
) -> BTreeMap<String, BTreeMap<String, Base64>> { ) -> BTreeMap<String, BTreeMap<String, Base64>> {
keys.into_iter() keys.into_iter()
.filter_map(|(server, keys)| { .filter_map(|(server, keys)| {
self.filter_keys_single_server(keys, timestamp, room_version_id) self.filter_keys_single_server(keys, timestamp)
.map(|keys| (server, keys)) .map(|keys| (server, keys))
}) })
.collect() .collect()
@ -590,7 +589,6 @@ impl Service {
&self, &self,
keys: SigningKeys, keys: SigningKeys,
timestamp: MilliSecondsSinceUnixEpoch, timestamp: MilliSecondsSinceUnixEpoch,
_room_version_id: &RoomVersionId,
) -> Option<BTreeMap<String, Base64>> { ) -> Option<BTreeMap<String, Base64>> {
let all_valid = keys.valid_until_ts > timestamp; let all_valid = keys.valid_until_ts > timestamp;

8
src/service/rooms/event_handler.rs
View file

@ -365,11 +365,9 @@ impl Service {
// Removing all the expired keys, unless the room version allows // Removing all the expired keys, unless the room version allows
// stale keys // stale keys
let filtered_keys = services().globals.filter_keys_server_map( let filtered_keys = services()
pkey_map, .globals
origin_server_ts, .filter_keys_server_map(pkey_map, origin_server_ts);
room_version_id,
);
let mut val = match ruma::signatures::verify_event( let mut val = match ruma::signatures::verify_event(
&filtered_keys, &filtered_keys,