Merge pull request #510 from matrix-org/jplatte/up-ruma

Author: jplatte

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
       uses: actions-rs/cargo@v1
       with:
         command: fmt
-        args: --all -- --check
+        args: -- --check
 
   typos:
     name: Spell Check with Typos

Cargo.toml

@@ -1,11 +1,2 @@
 [workspace]
-members = [
-    "crates/matrix-qrcode",
-    "crates/matrix-sdk",
-    "crates/matrix-sdk-appservice",
-    "crates/matrix-sdk-base",
-    "crates/matrix-sdk-common",
-    "crates/matrix-sdk-crypto",
-    "crates/matrix-sdk-test",
-    "crates/matrix-sdk-test-macros",
-]
+members = ["crates/*"]

crates/matrix-qrcode/Cargo.toml

@@ -24,13 +24,7 @@ base64 = "0.13.0"
 byteorder = "1.4.3"
 image = { version = "0.23.14", optional = true }
 qrcode = { version = "0.12.0", default-features = false }
+ruma-identifiers = "0.22.0"
+ruma-serde = "0.6.0"
 rqrr = { version = "0.4.0", optional = true }
 thiserror = "1.0.25"
-
-[dependencies.ruma-identifiers]
-git = "https://github.com/ruma/ruma/"
-rev = "b9f32bc6327542d382d4eb42ec43623495c50e66"
-
-[dependencies.ruma-serde]
-git = "https://github.com/ruma/ruma/"
-rev = "b9f32bc6327542d382d4eb42ec43623495c50e66"

crates/matrix-sdk-appservice/Cargo.toml

@@ -28,6 +28,7 @@ dashmap = "4"
 http = "0.2"
 matrix-sdk = { version = "0.4", path = "../matrix-sdk", default-features = false, features = ["appservice"] }
 regex = "1"
+ruma = { version = "0.5.0", features = ["client-api-c", "appservice-api-s"] }
 serde = "1"
 serde_json = "1"
 serde_yaml = "0.8"
@@ -36,11 +37,6 @@ tracing = "0.1"
 url = "2"
 warp = { version = "0.3.1", optional = true, default-features = false }
 
-[dependencies.ruma]
-git = "https://github.com/ruma/ruma/"
-rev = "b9f32bc6327542d382d4eb42ec43623495c50e66"
-features = ["client-api-c", "appservice-api-s"]
-
 [dev-dependencies]
 matrix-sdk-test = { version = "0.4", path = "../matrix-sdk-test", features = ["appservice"] }
 mockito = "0.30"

crates/matrix-sdk-appservice/src/error.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use ruma::api::client::r0::uiaa::UiaaInfo;
+use ruma::api::client::uiaa::UiaaInfo;
 use thiserror::Error;
 
 #[derive(Error, Debug)]

crates/matrix-sdk-appservice/src/lib.rs

@@ -105,7 +105,7 @@ use ruma::{
             query::{query_room_alias::v1 as query_room, query_user_id::v1 as query_user},
             Registration,
         },
-        client::r0::account::register,
+        client::account::register,
     },
     assign, identifiers, DeviceId, ServerName, UserId,
 };
@@ -448,7 +448,7 @@ impl AppService {
         *self.event_handler.rooms.lock().await = Some(handler);
     }
 
-    /// Register a virtual user by sending a [`register::Request`] to the
+    /// Register a virtual user by sending a [`register::v3::Request`] to the
     /// homeserver
     ///
     /// # Arguments
@@ -463,7 +463,7 @@ impl AppService {
         if self.is_user_registered(localpart.as_ref()).await? {
             return Ok(());
         }
-        let request = assign!(register::Request::new(), {
+        let request = assign!(register::v3::Request::new(), {
             username: Some(localpart.as_ref()),
             login_type: Some(&register::LoginType::ApplicationService),
         });

crates/matrix-sdk-base/Cargo.toml

@@ -46,6 +46,7 @@ matrix-sdk-common = { version = "0.4.0", path = "../matrix-sdk-common" }
 matrix-sdk-crypto = { version = "0.4.0", path = "../matrix-sdk-crypto", optional = true }
 pbkdf2 = { version = "0.10.0", default-features = false, optional = true }
 rand = { version = "0.8.4", optional = true }
+ruma = { version = "0.5.0", features = ["client-api-c", "signatures", "unstable-pre-spec"] }
 serde = { version = "1.0.126", features = ["rc"] }
 serde_json = "1.0.64"
 sha2 = { version = "0.10.1", optional = true }
@@ -61,11 +62,6 @@ tokio = { version = "1.7.1", optional = true, default-features = false, features
 indexed_db_futures = { version = "0.2.0", optional = true }
 wasm-bindgen = { version = "0.2.74", features = ["serde-serialize"], optional = true }
 
-[dependencies.ruma]
-git = "https://github.com/ruma/ruma/"
-rev = "b9f32bc6327542d382d4eb42ec43623495c50e66"
-features = ["client-api-c", "unstable-pre-spec"]
-
 [dev-dependencies]
 futures = { version = "0.3.15", default-features = false, features = ["executor"] }
 http = "0.2.4"

crates/matrix-sdk-base/src/client.rs

@@ -44,15 +44,15 @@ use matrix_sdk_crypto::{
 };
 #[cfg(feature = "encryption")]
 use ruma::{
-    api::client::r0::keys::claim_keys::Request as KeysClaimRequest,
+    api::client::keys::claim_keys::v3::Request as KeysClaimRequest,
     events::{
         room::{encrypted::RoomEncryptedEventContent, history_visibility::HistoryVisibility},
         AnySyncMessageEvent, MessageEventContent,
     },
     DeviceId, TransactionId,
 };
 use ruma::{
-    api::client::r0::{self as api, push::get_notifications::Notification},
+    api::client::{self as api, push::get_notifications::v3::Notification},
     events::{
         room::member::MembershipState, AnyGlobalAccountDataEvent, AnyRoomAccountDataEvent,
         AnyStrippedStateEvent, AnySyncEphemeralRoomEvent, AnySyncRoomEvent, AnySyncStateEvent,
@@ -355,7 +355,7 @@ impl BaseClient {
     /// and device id.
     pub async fn receive_login_response(
         &self,
-        response: &api::session::login::Response,
+        response: &api::session::login::v3::Response,
     ) -> Result<()> {
         let session = Session {
             access_token: response.access_token.clone(),
@@ -430,7 +430,7 @@ impl BaseClient {
     async fn handle_timeline(
         &self,
         room: &Room,
-        ruma_timeline: api::sync::sync_events::Timeline,
+        ruma_timeline: api::sync::sync_events::v3::Timeline,
         push_rules: &Ruleset,
         room_info: &mut RoomInfo,
         changes: &mut StateChanges,
@@ -727,10 +727,10 @@ impl BaseClient {
     /// * `response` - The response that we received after a successful sync.
     pub async fn receive_sync_response(
         &self,
-        response: api::sync::sync_events::Response,
+        response: api::sync::sync_events::v3::Response,
     ) -> Result<SyncResponse> {
         #[allow(unused_variables)]
-        let api::sync::sync_events::Response {
+        let api::sync::sync_events::v3::Response {
             next_batch,
             rooms,
             presence,
@@ -1009,7 +1009,7 @@ impl BaseClient {
     pub async fn receive_members(
         &self,
         room_id: &RoomId,
-        response: &api::membership::get_member_events::Response,
+        response: &api::membership::get_member_events::v3::Response,
     ) -> Result<MembersResponse> {
         let members: Vec<MemberEvent> = response
             .chunk
@@ -1094,7 +1094,7 @@ impl BaseClient {
     pub async fn receive_filter_upload(
         &self,
         filter_name: &str,
-        response: &api::filter::create_filter::Response,
+        response: &api::filter::create_filter::v3::Response,
     ) -> Result<()> {
         Ok(self.store.save_filter(filter_name, &response.filter_id).await?)
     }

crates/matrix-sdk-base/src/media.rs

@@ -1,7 +1,7 @@
 //! Common types for [media content](https://matrix.org/docs/spec/client_server/r0.6.1#id66).
 
 use ruma::{
-    api::client::r0::media::get_content_thumbnail::Method,
+    api::client::media::get_content_thumbnail::v3::Method,
     events::{
         room::{
             message::{

crates/matrix-sdk-base/src/rooms/normal.rs

@@ -20,7 +20,7 @@ use futures_core::stream::Stream;
 use futures_util::stream::{self, StreamExt};
 use matrix_sdk_common::locks::Mutex;
 use ruma::{
-    api::client::r0::sync::sync_events::RoomSummary as RumaSummary,
+    api::client::sync::sync_events::v3::RoomSummary as RumaSummary,
     events::{
         receipt::Receipt,
         room::{

crates/matrix-sdk-base/src/session.rs

@@ -45,8 +45,8 @@ pub struct Session {
     pub device_id: Box<DeviceId>,
 }
 
-impl From<ruma::api::client::r0::session::login::Response> for Session {
-    fn from(response: ruma::api::client::r0::session::login::Response) -> Self {
+impl From<ruma::api::client::session::login::v3::Response> for Session {
+    fn from(response: ruma::api::client::session::login::v3::Response) -> Self {
         Self {
             access_token: response.access_token,
             user_id: response.user_id,

crates/matrix-sdk-base/src/store/indexeddb_store.rs

@@ -23,10 +23,11 @@ use ruma::{
         receipt::Receipt,
         room::member::{MembershipState, RoomMemberEventContent},
         AnyGlobalAccountDataEvent, AnyRoomAccountDataEvent, AnySyncMessageEvent, AnySyncRoomEvent,
-        AnySyncStateEvent, EventType, Redact,
+        AnySyncStateEvent, EventType,
     },
     receipt::ReceiptType,
     serde::Raw,
+    signatures::{redact_in_place, CanonicalJsonObject},
     EventId, MxcUri, RoomId, RoomVersionId, UserId,
 };
 use serde::{Deserialize, Serialize};
@@ -623,10 +624,11 @@ impl IndexeddbStore {
                                     })
                                     .transpose()?
                                 {
-                                    let inner_event = full_event.event.deserialize()?;
-                                    full_event.event = Raw::new(&AnySyncRoomEvent::from(
-                                        inner_event.redact(redaction, &room_version),
-                                    ))?;
+                                    let mut event_json: CanonicalJsonObject =
+                                        full_event.event.deserialize_as()?;
+                                    redact_in_place(&mut event_json, &room_version)
+                                        .map_err(StoreError::Redaction)?;
+                                    full_event.event = Raw::new(&event_json)?.cast();
                                     timeline_store.put_key_val_owned(
                                         position_key,
                                         &self.serialize_event(&full_event)?,

crates/matrix-sdk-base/src/store/integration_tests.rs

@@ -10,11 +10,11 @@ macro_rules! statestore_integration_tests {
                 use matrix_sdk_test::{async_test, test_json};
                 use ruma::{
                     api::{
-                        client::r0::{
-                        media::get_content_thumbnail::Method,
-                        message::get_message_events::Response as MessageResponse,
-                        sync::sync_events::Response as SyncResponse,
-                    },
+                        client::{
+                            media::get_content_thumbnail::v3::Method,
+                            message::get_message_events::v3::Response as MessageResponse,
+                            sync::sync_events::v3::Response as SyncResponse,
+                        },
                         IncomingResponse,
                     },
                     device_id, event_id,

crates/matrix-sdk-base/src/store/memory_store.rs

@@ -28,10 +28,11 @@ use ruma::{
         receipt::Receipt,
         room::member::{MembershipState, RoomMemberEventContent},
         AnyGlobalAccountDataEvent, AnyRoomAccountDataEvent, AnyStrippedStateEvent,
-        AnySyncMessageEvent, AnySyncRoomEvent, AnySyncStateEvent, EventType, Redact,
+        AnySyncMessageEvent, AnySyncRoomEvent, AnySyncStateEvent, EventType,
     },
     receipt::ReceiptType,
     serde::Raw,
+    signatures::{redact_in_place, CanonicalJsonObject},
     EventId, MxcUri, RoomId, RoomVersionId, UserId,
 };
 #[allow(unused_imports)]
@@ -41,6 +42,7 @@ use super::{BoxStream, Result, RoomInfo, StateChanges, StateStore};
 use crate::{
     deserialized_responses::{MemberEvent, StrippedMemberEvent, SyncRoomEvent},
     media::{MediaRequest, UniqueKey},
+    StoreError,
 };
 
 #[allow(clippy::type_complexity)]
@@ -352,14 +354,13 @@ impl MemoryStore {
 
                         if let Some(position) = pos {
                             if let Some(mut full_event) = data.events.get_mut(&position.clone()) {
-                                let inner_event = full_event.event.deserialize()?;
-                                if room_version.is_none() {
-                                    room_version = Some(make_room_version());
-                                }
+                                let mut event_json: CanonicalJsonObject =
+                                    full_event.event.deserialize_as()?;
+                                let v = room_version.get_or_insert_with(make_room_version);
 
-                                full_event.event = Raw::new(&AnySyncRoomEvent::from(
-                                    inner_event.redact(redaction, room_version.as_ref().unwrap()),
-                                ))?;
+                                redact_in_place(&mut event_json, v)
+                                    .map_err(StoreError::Redaction)?;
+                                full_event.event = Raw::new(&event_json)?.cast();
                             }
                         }
                     }

crates/matrix-sdk-base/src/store/mod.rs

@@ -28,7 +28,7 @@ pub mod integration_tests;
 use dashmap::DashMap;
 use matrix_sdk_common::{async_trait, locks::RwLock, AsyncTraitDeps};
 use ruma::{
-    api::client::r0::push::get_notifications::Notification,
+    api::client::push::get_notifications::v3::Notification,
     events::{
         presence::PresenceEvent,
         receipt::{Receipt, ReceiptEventContent},
@@ -113,6 +113,11 @@ pub enum StoreError {
     #[cfg(feature = "sled_state_store")]
     #[error(transparent)]
     Task(#[from] tokio::task::JoinError),
+    /// Redacting an event in the store has failed.
+    ///
+    /// This should never happen.
+    #[error("Redaction failed: {0}")]
+    Redaction(#[source] ruma::signatures::Error),
 }
 
 #[cfg(feature = "indexeddb_state_store")]

crates/matrix-sdk-base/src/store/sled_store.rs

@@ -30,10 +30,11 @@ use ruma::{
         receipt::Receipt,
         room::member::{MembershipState, RoomMemberEventContent},
         AnyGlobalAccountDataEvent, AnyRoomAccountDataEvent, AnySyncMessageEvent, AnySyncRoomEvent,
-        AnySyncStateEvent, EventType, Redact,
+        AnySyncStateEvent, EventType,
     },
     receipt::ReceiptType,
     serde::Raw,
+    signatures::{redact_in_place, CanonicalJsonObject},
     EventId, MxcUri, RoomId, RoomVersionId, UserId,
 };
 use serde::{Deserialize, Serialize};
@@ -1181,11 +1182,11 @@ impl SledStore {
                                 })
                                 .transpose()?
                             {
-                                let inner_event = full_event.event.deserialize()?;
-
-                                full_event.event = Raw::new(&AnySyncRoomEvent::from(
-                                    inner_event.redact(redaction, &room_version),
-                                ))?;
+                                let mut event_json: CanonicalJsonObject =
+                                    full_event.event.deserialize_as()?;
+                                redact_in_place(&mut event_json, &room_version)
+                                    .map_err(StoreError::Redaction)?;
+                                full_event.event = Raw::new(&event_json)?.cast();
                                 timeline_batch
                                     .insert(position_key, self.serialize_event(&full_event)?);
                             }

crates/matrix-sdk-common/Cargo.toml

@@ -17,13 +17,9 @@ targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
 
 [dependencies]
 async-trait = "0.1.50"
+ruma = { version = "0.5.0", features = ["client-api-c"] }
 serde = "1.0.126"
 
-[dependencies.ruma]
-git = "https://github.com/ruma/ruma/"
-rev = "b9f32bc6327542d382d4eb42ec43623495c50e66"
-features = ["client-api-c"]
-
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 uuid = { version = "0.8.2", default-features = false, features = [
     "v4",