diff --git a/matrix_sdk/src/client.rs b/matrix_sdk/src/client.rs index 0c8221d1..3e5bf219 100644 --- a/matrix_sdk/src/client.rs +++ b/matrix_sdk/src/client.rs @@ -41,8 +41,8 @@ use tracing::{debug, warn}; use tracing::{error, info, instrument}; use matrix_sdk_base::{ - responses::SyncResponse, BaseClient, BaseClientConfig, EventEmitter, InvitedRoom, JoinedRoom, - LeftRoom, Session, Store, + deserialized_responses::SyncResponse, BaseClient, BaseClientConfig, EventEmitter, InvitedRoom, + JoinedRoom, LeftRoom, Session, Store, }; #[cfg(feature = "encryption")] diff --git a/matrix_sdk_base/Cargo.toml b/matrix_sdk_base/Cargo.toml index 542a4b54..c9642e32 100644 --- a/matrix_sdk_base/Cargo.toml +++ b/matrix_sdk_base/Cargo.toml @@ -25,7 +25,7 @@ docs = ["encryption", "sled_cryptostore", "messages"] [dependencies] dashmap= "4.0.1" -serde = { version = "1.0.118", features = ["rc"]} +serde = { version = "1.0.119", features = ["rc"] } serde_json = "1.0.61" zeroize = "1.2.0" tracing = "0.1.22" diff --git a/matrix_sdk_base/src/client.rs b/matrix_sdk_base/src/client.rs index 1469f805..3d1bdfa0 100644 --- a/matrix_sdk_base/src/client.rs +++ b/matrix_sdk_base/src/client.rs @@ -41,6 +41,10 @@ use matrix_sdk_common::{ #[cfg(feature = "encryption")] use matrix_sdk_common::{ api::r0::keys::claim_keys::Request as KeysClaimRequest, + deserialized_responses::{ + AccountData, Ephemeral, InviteState, InvitedRoom, JoinedRoom, LeftRoom, MemberEvent, + Presence, Rooms, State, StrippedMemberEvent, SyncResponse, Timeline, + }, events::{room::encrypted::EncryptedEventContent, AnyMessageEventContent, AnySyncMessageEvent}, identifiers::DeviceId, locks::Mutex, @@ -58,10 +62,6 @@ use zeroize::Zeroizing; use crate::{ error::Result, event_emitter::Emitter, - responses::{ - AccountData, Ephemeral, InviteState, InvitedRoom, JoinedRoom, LeftRoom, MemberEvent, - Presence, Rooms, State, StrippedMemberEvent, SyncResponse, Timeline, - }, rooms::{RoomInfo, RoomType, StrippedRoomInfo}, session::Session, store::{Result as StoreResult, SledStore, StateChanges, Store}, diff --git a/matrix_sdk_base/src/event_emitter/mod.rs b/matrix_sdk_base/src/event_emitter/mod.rs index 90d295ac..db5f4e58 100644 --- a/matrix_sdk_base/src/event_emitter/mod.rs +++ b/matrix_sdk_base/src/event_emitter/mod.rs @@ -18,6 +18,7 @@ use matrix_sdk_common::{events::AnySyncRoomEvent, identifiers::RoomId}; use serde_json::value::RawValue as RawJsonValue; use crate::{ + deserialized_responses::SyncResponse, events::{ call::{ answer::AnswerEventContent, candidates::CandidatesEventContent, @@ -46,7 +47,6 @@ use crate::{ AnySyncStateEvent, BasicEvent, StrippedStateEvent, SyncEphemeralRoomEvent, SyncMessageEvent, SyncStateEvent, }, - responses::SyncResponse, rooms::RoomState, Store, }; diff --git a/matrix_sdk_base/src/lib.rs b/matrix_sdk_base/src/lib.rs index 7aeea42f..92354d89 100644 --- a/matrix_sdk_base/src/lib.rs +++ b/matrix_sdk_base/src/lib.rs @@ -45,7 +45,6 @@ pub use matrix_sdk_common::*; mod client; mod error; mod event_emitter; -pub mod responses; mod rooms; mod session; mod store; diff --git a/matrix_sdk_base/src/rooms/members.rs b/matrix_sdk_base/src/rooms/members.rs index e17d6ad6..ef6042b0 100644 --- a/matrix_sdk_base/src/rooms/members.rs +++ b/matrix_sdk_base/src/rooms/members.rs @@ -23,7 +23,7 @@ use matrix_sdk_common::{ identifiers::UserId, }; -use crate::responses::MemberEvent; +use crate::deserialized_responses::MemberEvent; #[derive(Clone, Debug)] pub struct RoomMember { diff --git a/matrix_sdk_base/src/rooms/normal.rs b/matrix_sdk_base/src/rooms/normal.rs index 902b424f..73e73bf3 100644 --- a/matrix_sdk_base/src/rooms/normal.rs +++ b/matrix_sdk_base/src/rooms/normal.rs @@ -37,7 +37,7 @@ use serde::{Deserialize, Serialize}; use tracing::info; use crate::{ - responses::UnreadNotificationsCount, + deserialized_responses::UnreadNotificationsCount, store::{Result as StoreResult, SledStore}, }; diff --git a/matrix_sdk_base/src/store.rs b/matrix_sdk_base/src/store.rs index 0ac7f54f..9c6ead4b 100644 --- a/matrix_sdk_base/src/store.rs +++ b/matrix_sdk_base/src/store.rs @@ -21,7 +21,7 @@ use sled::{ use tracing::info; use crate::{ - responses::{MemberEvent, StrippedMemberEvent}, + deserialized_responses::{MemberEvent, StrippedMemberEvent}, rooms::{RoomInfo, RoomType, StrippedRoom}, InvitedRoom, JoinedRoom, LeftRoom, Room, RoomState, Session, }; @@ -610,7 +610,7 @@ mod test { use matrix_sdk_test::async_test; use super::{SledStore, StateChanges}; - use crate::responses::MemberEvent; + use crate::deserialized_responses::MemberEvent; fn user_id() -> UserId { user_id!("@example:localhost") diff --git a/matrix_sdk_common/Cargo.toml b/matrix_sdk_common/Cargo.toml index ca66ef11..baa741d7 100644 --- a/matrix_sdk_common/Cargo.toml +++ b/matrix_sdk_common/Cargo.toml @@ -15,6 +15,7 @@ unstable-synapse-quirks = ["ruma/unstable-synapse-quirks"] [dependencies] instant = { version = "0.1.9", features = ["wasm-bindgen", "now"] } +serde = "1.0.119" async-trait = "0.1.42" [dependencies.ruma] diff --git a/matrix_sdk_base/src/responses.rs b/matrix_sdk_common/src/deserialized_responses.rs similarity index 98% rename from matrix_sdk_base/src/responses.rs rename to matrix_sdk_common/src/deserialized_responses.rs index 32888ee4..37d1e3d4 100644 --- a/matrix_sdk_base/src/responses.rs +++ b/matrix_sdk_common/src/deserialized_responses.rs @@ -1,7 +1,7 @@ use serde::{Deserialize, Serialize}; use std::{collections::BTreeMap, convert::TryFrom, time::SystemTime}; -use matrix_sdk_common::{ +use super::{ api::r0::sync::sync_events::{ DeviceLists, UnreadNotificationsCount as RumaUnreadNotificationsCount, }, @@ -228,7 +228,7 @@ pub struct MemberEvent { } impl TryFrom> for MemberEvent { - type Error = matrix_sdk_common::identifiers::Error; + type Error = super::identifiers::Error; fn try_from(event: SyncStateEvent) -> Result { Ok(MemberEvent { @@ -244,7 +244,7 @@ impl TryFrom> for MemberEvent { } impl TryFrom> for MemberEvent { - type Error = matrix_sdk_common::identifiers::Error; + type Error = super::identifiers::Error; fn try_from(event: StateEvent) -> Result { Ok(MemberEvent { @@ -285,7 +285,7 @@ pub struct StrippedMemberEvent { } impl TryFrom> for StrippedMemberEvent { - type Error = matrix_sdk_common::identifiers::Error; + type Error = super::identifiers::Error; fn try_from(event: StrippedStateEvent) -> Result { Ok(StrippedMemberEvent { diff --git a/matrix_sdk_common/src/lib.rs b/matrix_sdk_common/src/lib.rs index b157defd..bb930356 100644 --- a/matrix_sdk_common/src/lib.rs +++ b/matrix_sdk_common/src/lib.rs @@ -13,6 +13,7 @@ pub use ruma::{ pub use uuid; +pub mod deserialized_responses; pub mod locks; /// Super trait that is used for our store traits, this trait will differ if diff --git a/matrix_sdk_crypto/Cargo.toml b/matrix_sdk_crypto/Cargo.toml index 9e025a70..e34c20fb 100644 --- a/matrix_sdk_crypto/Cargo.toml +++ b/matrix_sdk_crypto/Cargo.toml @@ -25,7 +25,7 @@ matrix-sdk-common = { version = "0.2.0", path = "../matrix_sdk_common" } olm-rs = { version = "1.0.0", features = ["serde"] } getrandom = "0.2.1" -serde = { version = "1.0.118", features = ["derive", "rc"] } +serde = { version = "1.0.119", features = ["derive", "rc"] } serde_json = "1.0.61" zeroize = { version = "1.2.0", features = ["zeroize_derive"] } diff --git a/matrix_sdk_test/Cargo.toml b/matrix_sdk_test/Cargo.toml index 1e0d1f16..3aa3e490 100644 --- a/matrix_sdk_test/Cargo.toml +++ b/matrix_sdk_test/Cargo.toml @@ -16,4 +16,4 @@ http = "0.2.2" matrix-sdk-common = { version = "0.2.0", path = "../matrix_sdk_common" } matrix-sdk-test-macros = { version = "0.1.0", path = "../matrix_sdk_test_macros" } lazy_static = "1.4.0" -serde = "1.0.118" +serde = "1.0.119"