mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-09 08:27:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(tests): Pass decryption_settings in to send_and_receive_encrypted_to_device_test_helper

Browse Source 
To allow passing in different values in future tests.
This commit is contained in:
Andy Balaam
2025-07-01 11:38:26 +01:00
committed by Andy Balaam
parent f4619c91d3
commit d061e7a5b2
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/matrix-sdk-crypto/src/machine/test_helpers.rs
View File

@@ -188,6 +188,7 @@ pub async fn send_and_receive_encrypted_to_device_test_helper(
recipient: &OlmMachine,
event_type: &str,
content: &Value,
decryption_settings: &DecryptionSettings,
) -> ProcessedToDeviceEvent {
let device =
sender.get_device(recipient.user_id(), recipient.device_id(), None).await.unwrap().unwrap();
@@ -218,11 +219,9 @@ pub async fn send_and_receive_encrypted_to_device_test_helper(
next_batch_token: None,
};
let decryption_settings =
DecryptionSettings { sender_device_trust_requirement: TrustRequirement::Untrusted };
let (decrypted, _) =
recipient.receive_sync_changes(sync_changes, &decryption_settings).await.unwrap();
assert_eq!(1, decrypted.len());
decrypted[0].clone()
}

24
crates/matrix-sdk-crypto/src/machine/tests/send_encrypted_to_device.rs
View File

@@ -51,11 +51,15 @@ async fn test_send_encrypted_to_device() {
"rooms": ["!726s6s6q:example.com"]
});
let decryption_settings =
DecryptionSettings { sender_device_trust_requirement: TrustRequirement::Untrusted };
let processed_event = send_and_receive_encrypted_to_device_test_helper(
&alice,
&bob,
custom_event_type,
&custom_content,
&decryption_settings,
)
.await;
@@ -124,11 +128,15 @@ async fn test_receive_custom_encrypted_to_device_fails_if_device_unknown() {
"rooms": ["!726s6s6q:example.com"]
});
let decryption_settings =
DecryptionSettings { sender_device_trust_requirement: TrustRequirement::Untrusted };
let processed_event = send_and_receive_encrypted_to_device_test_helper(
&alice,
&bob,
custom_event_type,
&custom_content,
&decryption_settings,
)
.await;
@@ -153,11 +161,15 @@ async fn test_send_olm_encryption_info_unverified_identity() {
"rooms": ["!726s6s6q:example.com"]
});
let decryption_settings =
DecryptionSettings { sender_device_trust_requirement: TrustRequirement::Untrusted };
let processed_event = send_and_receive_encrypted_to_device_test_helper(
&alice,
&bob,
custom_event_type,
&custom_content,
&decryption_settings,
)
.await;
@@ -193,11 +205,15 @@ async fn test_send_olm_encryption_info_verified_identity() {
"rooms": ["!726s6s6q:example.com"]
});
let decryption_settings =
DecryptionSettings { sender_device_trust_requirement: TrustRequirement::Untrusted };
let processed_event = send_and_receive_encrypted_to_device_test_helper(
&alice,
&bob,
custom_event_type,
&custom_content,
&decryption_settings,
)
.await;
@@ -229,11 +245,15 @@ async fn test_send_olm_encryption_info_verified_locally() {
.await
.unwrap();
let decryption_settings =
DecryptionSettings { sender_device_trust_requirement: TrustRequirement::Untrusted };
let processed_event = send_and_receive_encrypted_to_device_test_helper(
&alice,
&bob,
custom_event_type,
&custom_content,
&decryption_settings,
)
.await;
@@ -271,11 +291,15 @@ async fn test_send_olm_encryption_info_verification_violation() {
"rooms": ["!726s6s6q:example.com"]
});
let decryption_settings =
DecryptionSettings { sender_device_trust_requirement: TrustRequirement::Untrusted };
let processed_event = send_and_receive_encrypted_to_device_test_helper(
&alice,
&bob,
custom_event_type,
&custom_content,
&decryption_settings,
)
.await;