refactor: Replace more uses of RoomVersionId with RoomVersionRules

This commit is contained in:
Ginger
2026-04-07 10:44:05 -04:00
parent 3e1f97487f
commit d62eeda130
14 changed files with 86 additions and 233 deletions
+3 -2
View File
@@ -18,6 +18,7 @@ use ruma::{
CanonicalJsonObject, MilliSecondsSinceUnixEpoch, OwnedServerSigningKeyId, RoomVersionId,
ServerName, ServerSigningKeyId,
api::federation::discovery::{ServerSigningKeys, VerifyKey},
room_version_rules::RoomVersionRules,
serde::Raw,
signatures::{Ed25519KeyPair, PublicKeyMap, PublicKeySet},
};
@@ -117,10 +118,10 @@ async fn add_signing_keys(&self, new_keys: ServerSigningKeys) {
pub async fn required_keys_exist(
&self,
object: &CanonicalJsonObject,
version: &RoomVersionId,
room_version_rules: &RoomVersionRules,
) -> bool {
trace!(?object, "Checking required keys exist");
let Ok(required_keys) = required_keys(object, version) else {
let Ok(required_keys) = required_keys(object, &room_version_rules.signatures) else {
debug_error!("Failed to determine required keys");
return false;
};