From 6fe5acfc9782c9ddd09f0919423e7eff854fbbf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Wed, 27 Nov 2024 17:43:50 +0100 Subject: [PATCH] refactor(crypto): Move the requests module under the types module --- .../matrix-sdk-crypto/src/gossiping/machine.rs | 18 ++++++++++-------- crates/matrix-sdk-crypto/src/gossiping/mod.rs | 10 ++++++---- .../src/identities/manager.rs | 6 ++++-- crates/matrix-sdk-crypto/src/lib.rs | 9 ++++----- crates/matrix-sdk-crypto/src/machine/mod.rs | 2 +- crates/matrix-sdk-crypto/src/olm/account.rs | 2 +- .../matrix-sdk-crypto/src/olm/signing/mod.rs | 6 ++++-- .../src/session_manager/sessions.rs | 7 +++++-- crates/matrix-sdk-crypto/src/types/mod.rs | 1 + .../src/{requests.rs => types/requests/mod.rs} | 0 .../src/verification/machine.rs | 2 +- .../matrix-sdk-crypto/src/verification/mod.rs | 6 ++++-- .../src/verification/sas/mod.rs | 2 +- 13 files changed, 42 insertions(+), 29 deletions(-) rename crates/matrix-sdk-crypto/src/{requests.rs => types/requests/mod.rs} (100%) diff --git a/crates/matrix-sdk-crypto/src/gossiping/machine.rs b/crates/matrix-sdk-crypto/src/gossiping/machine.rs index 913a9a82f..7193a09c6 100644 --- a/crates/matrix-sdk-crypto/src/gossiping/machine.rs +++ b/crates/matrix-sdk-crypto/src/gossiping/machine.rs @@ -45,16 +45,18 @@ use crate::{ error::{EventError, OlmError, OlmResult}, identities::IdentityManager, olm::{InboundGroupSession, Session}, - requests::{OutgoingRequest, ToDeviceRequest}, session_manager::GroupSessionCache, store::{Changes, CryptoStoreError, SecretImportError, Store, StoreCache}, - types::events::{ - forwarded_room_key::ForwardedRoomKeyContent, - olm_v1::{DecryptedForwardedRoomKeyEvent, DecryptedSecretSendEvent}, - room::encrypted::EncryptedEvent, - room_key_request::RoomKeyRequestEvent, - secret_send::SecretSendContent, - EventType, + types::{ + events::{ + forwarded_room_key::ForwardedRoomKeyContent, + olm_v1::{DecryptedForwardedRoomKeyEvent, DecryptedSecretSendEvent}, + room::encrypted::EncryptedEvent, + room_key_request::RoomKeyRequestEvent, + secret_send::SecretSendContent, + EventType, + }, + requests::{OutgoingRequest, ToDeviceRequest}, }, Device, MegolmError, }; diff --git a/crates/matrix-sdk-crypto/src/gossiping/mod.rs b/crates/matrix-sdk-crypto/src/gossiping/mod.rs index 9287d267a..2593091b2 100644 --- a/crates/matrix-sdk-crypto/src/gossiping/mod.rs +++ b/crates/matrix-sdk-crypto/src/gossiping/mod.rs @@ -36,10 +36,12 @@ use ruma::{ use serde::{Deserialize, Serialize}; use crate::{ - requests::{OutgoingRequest, ToDeviceRequest}, - types::events::{ - olm_v1::DecryptedSecretSendEvent, - room_key_request::{RoomKeyRequestContent, RoomKeyRequestEvent, SupportedKeyInfo}, + types::{ + events::{ + olm_v1::DecryptedSecretSendEvent, + room_key_request::{RoomKeyRequestContent, RoomKeyRequestEvent, SupportedKeyInfo}, + }, + requests::{OutgoingRequest, ToDeviceRequest}, }, Device, }; diff --git a/crates/matrix-sdk-crypto/src/identities/manager.rs b/crates/matrix-sdk-crypto/src/identities/manager.rs index 2a06208cf..d07a95982 100644 --- a/crates/matrix-sdk-crypto/src/identities/manager.rs +++ b/crates/matrix-sdk-crypto/src/identities/manager.rs @@ -33,12 +33,14 @@ use crate::{ error::OlmResult, identities::{DeviceData, OtherUserIdentityData, OwnUserIdentityData, UserIdentityData}, olm::{InboundGroupSession, PrivateCrossSigningIdentity, SenderDataFinder, SenderDataType}, - requests::KeysQueryRequest, store::{ caches::SequenceNumber, Changes, DeviceChanges, IdentityChanges, KeyQueryManager, Result as StoreResult, Store, StoreCache, StoreCacheGuard, UserKeyQueryResult, }, - types::{CrossSigningKey, DeviceKeys, MasterPubkey, SelfSigningPubkey, UserSigningPubkey}, + types::{ + requests::KeysQueryRequest, CrossSigningKey, DeviceKeys, MasterPubkey, SelfSigningPubkey, + UserSigningPubkey, + }, CryptoStoreError, LocalTrust, OwnUserIdentity, SignatureError, UserIdentity, }; diff --git a/crates/matrix-sdk-crypto/src/lib.rs b/crates/matrix-sdk-crypto/src/lib.rs index d483e845b..5d16721c4 100644 --- a/crates/matrix-sdk-crypto/src/lib.rs +++ b/crates/matrix-sdk-crypto/src/lib.rs @@ -28,7 +28,6 @@ mod gossiping; mod identities; mod machine; pub mod olm; -pub mod requests; pub mod secret_storage; mod session_manager; pub mod store; @@ -97,15 +96,15 @@ use matrix_sdk_common::deserialized_responses::{DecryptedRoomEvent, UnableToDecr #[cfg(feature = "qrcode")] pub use matrix_sdk_qrcode; pub use olm::{Account, CrossSigningStatus, EncryptionSettings, Session}; -pub use requests::{ - IncomingResponse, KeysBackupRequest, KeysQueryRequest, OutgoingRequest, OutgoingRequests, - OutgoingVerificationRequest, RoomMessageRequest, ToDeviceRequest, UploadSigningKeysRequest, -}; use serde::{Deserialize, Serialize}; pub use session_manager::CollectStrategy; pub use store::{ CrossSigningKeyExport, CryptoStoreError, SecretImportError, SecretInfo, TrackedUser, }; +pub use types::requests::{ + IncomingResponse, KeysBackupRequest, KeysQueryRequest, OutgoingRequest, OutgoingRequests, + OutgoingVerificationRequest, RoomMessageRequest, ToDeviceRequest, UploadSigningKeysRequest, +}; pub use verification::{ format_emojis, AcceptSettings, AcceptedProtocols, CancelInfo, Emoji, EmojiShortAuthString, Sas, SasState, Verification, VerificationRequest, VerificationRequestState, diff --git a/crates/matrix-sdk-crypto/src/machine/mod.rs b/crates/matrix-sdk-crypto/src/machine/mod.rs index 9d8222751..ad25c9289 100644 --- a/crates/matrix-sdk-crypto/src/machine/mod.rs +++ b/crates/matrix-sdk-crypto/src/machine/mod.rs @@ -70,7 +70,6 @@ use crate::{ KnownSenderData, OlmDecryptionInfo, PrivateCrossSigningIdentity, SenderData, SenderDataFinder, SessionType, StaticAccountData, }, - requests::{IncomingResponse, OutgoingRequest, UploadSigningKeysRequest}, session_manager::{GroupSessionManager, SessionManager}, store::{ Changes, CryptoStoreWrapper, DeviceChanges, IdentityChanges, IntoCryptoStore, MemoryStore, @@ -90,6 +89,7 @@ use crate::{ }, ToDeviceEvents, }, + requests::{IncomingResponse, OutgoingRequest, UploadSigningKeysRequest}, EventEncryptionAlgorithm, Signatures, }, utilities::timestamp_to_iso8601, diff --git a/crates/matrix-sdk-crypto/src/olm/account.rs b/crates/matrix-sdk-crypto/src/olm/account.rs index b10340fee..efdd1402a 100644 --- a/crates/matrix-sdk-crypto/src/olm/account.rs +++ b/crates/matrix-sdk-crypto/src/olm/account.rs @@ -63,7 +63,6 @@ use crate::{ error::{EventError, OlmResult, SessionCreationError}, identities::DeviceData, olm::SenderData, - requests::UploadSigningKeysRequest, store::{Changes, DeviceChanges, Store}, types::{ events::{ @@ -73,6 +72,7 @@ use crate::{ ToDeviceEncryptedEventContent, }, }, + requests::UploadSigningKeysRequest, CrossSigningKey, DeviceKeys, EventEncryptionAlgorithm, MasterPubkey, OneTimeKey, SignedKey, }, OlmError, SignatureError, diff --git a/crates/matrix-sdk-crypto/src/olm/signing/mod.rs b/crates/matrix-sdk-crypto/src/olm/signing/mod.rs index 293d3a495..061ada9ff 100644 --- a/crates/matrix-sdk-crypto/src/olm/signing/mod.rs +++ b/crates/matrix-sdk-crypto/src/olm/signing/mod.rs @@ -32,9 +32,11 @@ use vodozemac::Ed25519Signature; use super::StaticAccountData; use crate::{ error::SignatureError, - requests::UploadSigningKeysRequest, store::SecretImportError, - types::{DeviceKeys, MasterPubkey, SelfSigningPubkey, UserSigningPubkey}, + types::{ + requests::UploadSigningKeysRequest, DeviceKeys, MasterPubkey, SelfSigningPubkey, + UserSigningPubkey, + }, Account, DeviceData, OtherUserIdentityData, OwnUserIdentity, OwnUserIdentityData, }; diff --git a/crates/matrix-sdk-crypto/src/session_manager/sessions.rs b/crates/matrix-sdk-crypto/src/session_manager/sessions.rs index 2ae2306c3..e1e3aab17 100644 --- a/crates/matrix-sdk-crypto/src/session_manager/sessions.rs +++ b/crates/matrix-sdk-crypto/src/session_manager/sessions.rs @@ -34,9 +34,12 @@ use vodozemac::Curve25519PublicKey; use crate::{ error::OlmResult, gossiping::GossipMachine, - requests::{OutgoingRequest, ToDeviceRequest}, store::{Changes, Result as StoreResult, Store}, - types::{events::EventType, EventEncryptionAlgorithm}, + types::{ + events::EventType, + requests::{OutgoingRequest, ToDeviceRequest}, + EventEncryptionAlgorithm, + }, DeviceData, }; diff --git a/crates/matrix-sdk-crypto/src/types/mod.rs b/crates/matrix-sdk-crypto/src/types/mod.rs index c76f0b472..bd22d3a78 100644 --- a/crates/matrix-sdk-crypto/src/types/mod.rs +++ b/crates/matrix-sdk-crypto/src/types/mod.rs @@ -47,6 +47,7 @@ mod device_keys; pub mod events; mod one_time_keys; pub mod qr_login; +pub mod requests; pub use self::{backup::*, cross_signing::*, device_keys::*, one_time_keys::*}; use crate::store::BackupDecryptionKey; diff --git a/crates/matrix-sdk-crypto/src/requests.rs b/crates/matrix-sdk-crypto/src/types/requests/mod.rs similarity index 100% rename from crates/matrix-sdk-crypto/src/requests.rs rename to crates/matrix-sdk-crypto/src/types/requests/mod.rs diff --git a/crates/matrix-sdk-crypto/src/verification/machine.rs b/crates/matrix-sdk-crypto/src/verification/machine.rs index 892fa2551..0e62d2f93 100644 --- a/crates/matrix-sdk-crypto/src/verification/machine.rs +++ b/crates/matrix-sdk-crypto/src/verification/machine.rs @@ -38,8 +38,8 @@ use super::{ }; use crate::{ olm::{PrivateCrossSigningIdentity, StaticAccountData}, - requests::OutgoingRequest, store::{CryptoStoreError, CryptoStoreWrapper}, + types::requests::OutgoingRequest, DeviceData, OtherUserIdentityData, OutgoingVerificationRequest, RoomMessageRequest, ToDeviceRequest, }; diff --git a/crates/matrix-sdk-crypto/src/verification/mod.rs b/crates/matrix-sdk-crypto/src/verification/mod.rs index 1598114fb..a42b9eddb 100644 --- a/crates/matrix-sdk-crypto/src/verification/mod.rs +++ b/crates/matrix-sdk-crypto/src/verification/mod.rs @@ -746,9 +746,11 @@ pub(crate) mod tests { use super::{event_enums::OutgoingContent, VerificationStore}; use crate::{ olm::PrivateCrossSigningIdentity, - requests::{OutgoingRequest, OutgoingRequests}, store::{Changes, CryptoStore, CryptoStoreWrapper, IdentityChanges, MemoryStore}, - types::events::ToDeviceEvents, + types::{ + events::ToDeviceEvents, + requests::{OutgoingRequest, OutgoingRequests}, + }, Account, DeviceData, OtherUserIdentityData, OutgoingVerificationRequest, OwnUserIdentityData, }; diff --git a/crates/matrix-sdk-crypto/src/verification/sas/mod.rs b/crates/matrix-sdk-crypto/src/verification/sas/mod.rs index caf43a249..0b2f0dc7a 100644 --- a/crates/matrix-sdk-crypto/src/verification/sas/mod.rs +++ b/crates/matrix-sdk-crypto/src/verification/sas/mod.rs @@ -43,8 +43,8 @@ use super::{ use crate::{ identities::{DeviceData, UserIdentityData}, olm::StaticAccountData, - requests::{OutgoingVerificationRequest, RoomMessageRequest}, store::CryptoStoreError, + types::requests::{OutgoingVerificationRequest, RoomMessageRequest}, Emoji, ToDeviceRequest, };