mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-06-21 22:58:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

crypto: test: factor out create_test_outbound_group_session helper

Browse Source
This commit is contained in:
Richard van der Hoff
2024-08-12 19:43:54 +01:00
committed by Richard van der Hoff
parent 66142317d4
commit 324cf2e007
1 changed files with 19 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
crates/matrix-sdk-crypto/src/session_manager/group_sessions/share_strategy.rs
View File

@@ -475,16 +475,7 @@ mod tests {
let encryption_settings =
EncryptionSettings { sharing_strategy: legacy_strategy.clone(), ..Default::default() };
let fake_room_id = room_id!("!roomid:localhost");
let id_keys = machine.identity_keys();
let group_session = OutboundGroupSession::new(
machine.device_id().into(),
Arc::new(id_keys),
fake_room_id,
encryption_settings.clone(),
)
.unwrap();
let group_session = create_test_outbound_group_session(&machine, &encryption_settings);
let share_result = collect_session_recipients(
machine.store(),
@@ -519,8 +510,6 @@ mod tests {
async fn test_share_with_per_device_strategy_only_trusted() {
let machine = set_up_test_machine().await;
let fake_room_id = room_id!("!roomid:localhost");
let legacy_strategy = CollectStrategy::DeviceBasedStrategy {
only_allow_trusted_devices: true,
error_on_verified_user_problem: false,
@@ -529,14 +518,7 @@ mod tests {
let encryption_settings =
EncryptionSettings { sharing_strategy: legacy_strategy.clone(), ..Default::default() };
let id_keys = machine.identity_keys();
let group_session = OutboundGroupSession::new(
machine.device_id().into(),
Arc::new(id_keys),
fake_room_id,
encryption_settings.clone(),
)
.unwrap();
let group_session = create_test_outbound_group_session(&machine, &encryption_settings);
let share_result = collect_session_recipients(
machine.store(),
@@ -594,21 +576,12 @@ mod tests {
async fn test_share_with_identity_strategy() {
let machine = set_up_test_machine().await;
let fake_room_id = room_id!("!roomid:localhost");
let strategy = CollectStrategy::new_identity_based();
let encryption_settings =
EncryptionSettings { sharing_strategy: strategy.clone(), ..Default::default() };
let id_keys = machine.identity_keys();
let group_session = OutboundGroupSession::new(
machine.device_id().into(),
Arc::new(id_keys),
fake_room_id,
encryption_settings.clone(),
)
.unwrap();
let group_session = create_test_outbound_group_session(&machine, &encryption_settings);
let share_result = collect_session_recipients(
machine.store(),
@@ -669,8 +642,6 @@ mod tests {
async fn test_should_rotate_based_on_visibility() {
let machine = set_up_test_machine().await;
let fake_room_id = room_id!("!roomid:localhost");
let strategy = CollectStrategy::DeviceBasedStrategy {
only_allow_trusted_devices: false,
error_on_verified_user_problem: false,
@@ -682,14 +653,7 @@ mod tests {
..Default::default()
};
let id_keys = machine.identity_keys();
let group_session = OutboundGroupSession::new(
machine.device_id().into(),
Arc::new(id_keys),
fake_room_id,
encryption_settings.clone(),
)
.unwrap();
let group_session = create_test_outbound_group_session(&machine, &encryption_settings);
let _ = collect_session_recipients(
machine.store(),
@@ -772,4 +736,19 @@ mod tests {
assert!(share_result.should_rotate);
}
/// Create an [`OutboundGroupSession`], backed by the given olm machine,
/// without sharing it.
fn create_test_outbound_group_session(
machine: &OlmMachine,
encryption_settings: &EncryptionSettings,
) -> OutboundGroupSession {
OutboundGroupSession::new(
machine.device_id().into(),
Arc::new(machine.identity_keys()),
room_id!("!roomid:localhost"),
encryption_settings.clone(),
)
.expect("creating an outbound group session should not fail")
}
}