chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

state-res: Rename RoomVersion::VERSION{num} to RoomVersion::V{num}

Browse Source
This commit is contained in:
Jonas Platte 2021-12-04 18:55:16 +01:00
parent a1cf04076c
commit 96374a7517
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
3 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ruma-state-res/src/event_auth.rs
View File

@ -899,7 +899,7 @@ mod tests {
let sender = alice(); let sender = alice();
assert!(valid_membership_change( assert!(valid_membership_change(
&RoomVersion::VERSION6, &RoomVersion::V6,
&target_user, &target_user,
fetch_state(EventType::RoomMember, target_user.to_string()), fetch_state(EventType::RoomMember, target_user.to_string()),
&sender, &sender,
@ -944,7 +944,7 @@ mod tests {
let sender = charlie(); let sender = charlie();
assert!(!valid_membership_change( assert!(!valid_membership_change(
&RoomVersion::VERSION6, &RoomVersion::V6,
&target_user, &target_user,
fetch_state(EventType::RoomMember, target_user.to_string()), fetch_state(EventType::RoomMember, target_user.to_string()),
&sender, &sender,

2
crates/ruma-state-res/src/lib.rs
View File

@ -696,7 +696,7 @@ mod tests {
.unwrap(); .unwrap();
let resolved_power = crate::iterative_auth_check( let resolved_power = crate::iterative_auth_check(
&RoomVersion::VERSION6, &RoomVersion::V6,
&sorted_power_events, &sorted_power_events,
HashMap::new(), // unconflicted events HashMap::new(), // unconflicted events
|id| events.get(id).map(Arc::clone), |id| events.get(id).map(Arc::clone),

45
crates/ruma-state-res/src/room_version.rs
View File

@ -69,7 +69,7 @@ pub struct RoomVersion {
} }
impl RoomVersion { impl RoomVersion {
pub const VERSION1: Self = Self { pub const V1: Self = Self {
disposition: RoomDisposition::Stable, disposition: RoomDisposition::Stable,
event_format: EventFormatVersion::V1, event_format: EventFormatVersion::V1,
state_res: StateResolutionVersion::V1, state_res: StateResolutionVersion::V1,
@ -82,53 +82,50 @@ impl RoomVersion {
restricted_join_rules: false, restricted_join_rules: false,
}; };
pub const VERSION2: Self = Self { state_res: StateResolutionVersion::V2, ..Self::VERSION1 }; pub const V2: Self = Self { state_res: StateResolutionVersion::V2, ..Self::V1 };
pub const VERSION3: Self = Self { pub const V3: Self =
event_format: EventFormatVersion::V2, Self { event_format: EventFormatVersion::V2, extra_redaction_checks: true, ..Self::V2 };
extra_redaction_checks: true,
..Self::VERSION2
};
pub const VERSION4: Self = Self { event_format: EventFormatVersion::V3, ..Self::VERSION3 }; pub const V4: Self = Self { event_format: EventFormatVersion::V3, ..Self::V3 };
pub const VERSION5: Self = Self { enforce_key_validity: true, ..Self::VERSION4 }; pub const V5: Self = Self { enforce_key_validity: true, ..Self::V4 };
pub const VERSION6: Self = Self { pub const V6: Self = Self {
special_case_aliases_auth: false, special_case_aliases_auth: false,
strict_canonicaljson: true, strict_canonicaljson: true,
limit_notifications_power_levels: true, limit_notifications_power_levels: true,
..Self::VERSION5 ..Self::V5
}; };
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
pub const VERSION7: Self = Self { pub const V7: Self = Self {
// FIXME: once room version 7 is stabilized move this to version 8 // FIXME: once room version 7 is stabilized move this to version 8
disposition: RoomDisposition::Unstable, disposition: RoomDisposition::Unstable,
allow_knocking: true, allow_knocking: true,
..Self::VERSION6 ..Self::V6
}; };
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
pub const VERSION8: Self = Self { restricted_join_rules: true, ..Self::VERSION7 }; pub const V8: Self = Self { restricted_join_rules: true, ..Self::V7 };
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
pub const VERSION9: Self = Self::VERSION8; pub const V9: Self = Self::V8;
pub fn new(version: &RoomVersionId) -> Result<Self> { pub fn new(version: &RoomVersionId) -> Result<Self> {
Ok(match version { Ok(match version {
RoomVersionId::V1 => Self::VERSION1, RoomVersionId::V1 => Self::V1,
RoomVersionId::V2 => Self::VERSION2, RoomVersionId::V2 => Self::V2,
RoomVersionId::V3 => Self::VERSION3, RoomVersionId::V3 => Self::V3,
RoomVersionId::V4 => Self::VERSION4, RoomVersionId::V4 => Self::V4,
RoomVersionId::V5 => Self::VERSION5, RoomVersionId::V5 => Self::V5,
RoomVersionId::V6 => Self::VERSION6, RoomVersionId::V6 => Self::V6,
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
RoomVersionId::V7 => Self::VERSION7, RoomVersionId::V7 => Self::V7,
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
RoomVersionId::V8 => Self::VERSION8, RoomVersionId::V8 => Self::V8,
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
RoomVersionId::V9 => Self::VERSION9, RoomVersionId::V9 => Self::V9,
ver => return Err(Error::Unsupported(format!("found version `{}`", ver.as_str()))), ver => return Err(Error::Unsupported(format!("found version `{}`", ver.as_str()))),
}) })
} }