refactor(crypto): Move the requests module under the types module

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,
 };

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,
 };

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,
 };
 

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,

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,

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,

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,
 };
 

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,
 };
 

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;

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,
 };

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,
     };

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,
 };