From 1de791c20729713c5e2f5dc530dafbba4e95590d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Thu, 23 Apr 2020 10:52:47 +0200 Subject: [PATCH] rust-sdk: Update to the latest ruma releases. --- Cargo.toml | 8 ++-- examples/command_bot.rs | 2 + src/async_client.rs | 65 +++++++++++++----------------- src/base_client.rs | 27 ++++++------- src/crypto/device.rs | 12 +++--- src/crypto/machine.rs | 81 ++++++++++++++++++++++---------------- src/crypto/olm.rs | 6 +-- src/crypto/store/sqlite.rs | 8 ++-- src/models/room.rs | 4 +- src/request_builder.rs | 14 ++++--- src/test_builder.rs | 24 +++++------ 11 files changed, 126 insertions(+), 125 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6aec8a38..a284189a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,10 +24,10 @@ async-trait = "0.1.30" # Ruma dependencies js_int = "0.1.4" -ruma-api = "0.15.1" -ruma-client-api = { git = "https://github.com/matrix-org/ruma-client-api/", version = "0.7.0" } -ruma-events = { git = "https://github.com/matrix-org/ruma-events", version = "0.18.0" } -ruma-identifiers = "0.14.1" +ruma-api = "0.16.0-rc.2" +ruma-client-api = { version = "0.8.0-rc.5" } +ruma-events = { version = "0.21.0-beta.1" } +ruma-identifiers = "0.16.0" uuid = { version = "0.8.1", features = ["v4"] } # Dependencies for the encryption support diff --git a/examples/command_bot.rs b/examples/command_bot.rs index 220b0ea1..fded958e 100644 --- a/examples/command_bot.rs +++ b/examples/command_bot.rs @@ -101,6 +101,8 @@ async fn login_and_sync( #[tokio::main] async fn main() -> Result<(), matrix_sdk::Error> { + tracing_subscriber::fmt::init(); + let (homeserver_url, username, password) = match (env::args().nth(1), env::args().nth(2), env::args().nth(3)) { (Some(a), Some(b), Some(c)) => (a, b, c), diff --git a/src/async_client.rs b/src/async_client.rs index 94fc33bb..8a4a5d60 100644 --- a/src/async_client.rs +++ b/src/async_client.rs @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -use std::collections::HashMap; +use std::collections::{BTreeMap, HashMap}; use std::convert::{TryFrom, TryInto}; use std::result::Result as StdResult; use std::sync::Arc; @@ -33,9 +33,9 @@ use http::Response as HttpResponse; use reqwest::header::{HeaderValue, InvalidHeaderValue}; use url::Url; -use ruma_api::{Endpoint, Outgoing}; +use ruma_api::Endpoint; use ruma_events::room::message::MessageEventContent; -use ruma_events::EventResult; +use ruma_events::EventJson; pub use ruma_events::EventType; use ruma_identifiers::{RoomId, RoomIdOrAliasId, UserId}; @@ -370,9 +370,11 @@ impl AsyncClient { pub async fn join_room_by_id_or_alias( &self, alias: &RoomIdOrAliasId, + server_name: &str, ) -> Result { let request = join_room_by_id_or_alias::Request { room_id_or_alias: alias.clone(), + server_name: server_name.to_owned(), third_party_signed: None, }; self.send(request).await @@ -538,7 +540,7 @@ impl AsyncClient { pub async fn room_messages>( &self, request: R, - ) -> Result { + ) -> Result { let req = request.into(); self.send(req).await } @@ -549,7 +551,7 @@ impl AsyncClient { /// /// * `sync_settings` - Settings for the sync call. #[instrument] - pub async fn sync(&self, sync_settings: SyncSettings) -> Result { + pub async fn sync(&self, sync_settings: SyncSettings) -> Result { let request = sync_events::Request { filter: None, since: sync_settings.token, @@ -564,7 +566,7 @@ impl AsyncClient { let matrix_room = { let mut client = self.base_client.write().await; for event in &room.state.events { - if let EventResult::Ok(e) = event { + if let Ok(e) = event.deserialize() { client.receive_joined_state_event(&room_id, &e).await; } } @@ -577,9 +579,9 @@ impl AsyncClient { // re looping is not ideal here for event in &mut room.state.events { - if let EventResult::Ok(e) = event { + if let Ok(e) = event.deserialize() { let client = self.base_client.read().await; - client.emit_state_event(room_id, e).await; + client.emit_state_event(&room_id, &e).await; } } @@ -595,19 +597,19 @@ impl AsyncClient { *event = e; } - if let EventResult::Ok(e) = event { + if let Ok(e) = event.deserialize() { let client = self.base_client.read().await; - client.emit_timeline_event(room_id, e).await; + client.emit_timeline_event(&room_id, &e).await; } } // look at AccountData to further cut down users by collecting ignored users for account_data in &mut room.account_data.events { { - if let EventResult::Ok(e) = account_data { + if let Ok(e) = account_data.deserialize() { let mut client = self.base_client.write().await; - client.receive_account_data_event(&room_id, e).await; - client.emit_account_data_event(room_id, e).await; + client.receive_account_data_event(&room_id, &e).await; + client.emit_account_data_event(&room_id, &e).await; } } } @@ -617,22 +619,22 @@ impl AsyncClient { // efficient but we need a room_id so we would loop through now or later. for presence in &mut response.presence.events { { - if let EventResult::Ok(e) = presence { + if let Ok(e) = presence.deserialize() { let mut client = self.base_client.write().await; - client.receive_presence_event(&room_id, e).await; + client.receive_presence_event(&room_id, &e).await; - client.emit_presence_event(room_id, e).await; + client.emit_presence_event(&room_id, &e).await; } } } for ephemeral in &mut room.ephemeral.events { { - if let EventResult::Ok(e) = ephemeral { + if let Ok(e) = ephemeral.deserialize() { let mut client = self.base_client.write().await; - client.receive_ephemeral_event(&room_id, e).await; + client.receive_ephemeral_event(&room_id, &e).await; - client.emit_ephemeral_event(room_id, e).await; + client.emit_ephemeral_event(&room_id, &e).await; } } } @@ -703,7 +705,7 @@ impl AsyncClient { pub async fn sync_forever( &self, sync_settings: SyncSettings, - callback: impl Fn(sync_events::IncomingResponse) -> C + Send, + callback: impl Fn(sync_events::Response) -> C + Send, ) where C: Future, { @@ -759,18 +761,7 @@ impl AsyncClient { async fn send + std::fmt::Debug>( &self, request: Request, - ) -> Result<::Incoming> - where - Request::Incoming: - TryFrom>, Error = ruma_api::error::FromHttpRequestError>, - ::Incoming: TryFrom< - http::Response>, - Error = ruma_api::error::FromHttpResponseError< - ::ResponseError, - >, - >, - ::ResponseError: std::fmt::Debug, - { + ) -> Result { let request: http::Request> = request.try_into()?; let url = request.uri(); let path_and_query = url.path_and_query().unwrap(); @@ -828,9 +819,7 @@ impl AsyncClient { let body = response.bytes().await?.as_ref().to_owned(); let http_response = http_builder.body(body).unwrap(); - Ok(::Incoming::try_from( - http_response, - )?) + Ok(::try_from(http_response)?) } /// Send a room message to the homeserver. @@ -940,7 +929,7 @@ impl AsyncClient { room_id: room_id.clone(), event_type, txn_id: txn_id.unwrap_or_else(Uuid::new_v4).to_string(), - data: content, + data: EventJson::from(content), }; let response = self.send(request).await?; @@ -962,7 +951,7 @@ impl AsyncClient { #[instrument] async fn claim_one_time_keys( &self, - one_time_keys: HashMap>, + one_time_keys: BTreeMap>, ) -> Result { let request = claim_keys::Request { timeout: None, @@ -1076,7 +1065,7 @@ impl AsyncClient { users_for_query ); - let mut device_keys: HashMap> = HashMap::new(); + let mut device_keys: BTreeMap> = BTreeMap::new(); for user in users_for_query.drain() { device_keys.insert(user, Vec::new()); diff --git a/src/base_client.rs b/src/base_client.rs index 30cefc79..d139667d 100644 --- a/src/base_client.rs +++ b/src/base_client.rs @@ -15,7 +15,7 @@ use std::collections::HashMap; #[cfg(feature = "encryption")] -use std::collections::HashSet; +use std::collections::{BTreeMap, HashSet}; use std::fmt; use std::sync::Arc; @@ -30,7 +30,7 @@ use crate::events::presence::PresenceEvent; use crate::events::collections::only::Event as NonRoomEvent; use crate::events::ignored_user_list::IgnoredUserListEvent; use crate::events::push_rules::{PushRulesEvent, Ruleset}; -use crate::events::EventResult; +use crate::events::EventJson; use crate::identifiers::{RoomId, UserId}; use crate::models::Room; use crate::session::Session; @@ -234,10 +234,10 @@ impl Client { pub async fn receive_joined_timeline_event( &mut self, room_id: &RoomId, - event: &mut EventResult, - ) -> Option> { - match event { - EventResult::Ok(e) => { + event: &mut EventJson, + ) -> Option> { + match event.deserialize() { + Ok(mut e) => { #[cfg(feature = "encryption")] let mut decrypted_event = None; #[cfg(not(feature = "encryption"))] @@ -246,12 +246,12 @@ impl Client { #[cfg(feature = "encryption")] { match e { - RoomEvent::RoomEncrypted(e) => { + RoomEvent::RoomEncrypted(ref mut e) => { e.room_id = Some(room_id.to_owned()); let mut olm = self.olm.lock().await; if let Some(o) = &mut *olm { - decrypted_event = o.decrypt_room_event(e).await.ok(); + decrypted_event = o.decrypt_room_event(&e).await.ok(); } } _ => (), @@ -259,7 +259,7 @@ impl Client { } let mut room = self.get_or_create_room(&room_id).write().await; - room.receive_timeline_event(e); + room.receive_timeline_event(&e); decrypted_event } _ => None, @@ -358,10 +358,7 @@ impl Client { /// # Arguments /// /// * `response` - The response that we received after a successful sync. - pub async fn receive_sync_response( - &mut self, - response: &mut api::sync::sync_events::IncomingResponse, - ) { + pub async fn receive_sync_response(&mut self, response: &mut api::sync::sync_events::Response) { self.sync_token = Some(response.next_batch.clone()); #[cfg(feature = "encryption")] @@ -437,12 +434,12 @@ impl Client { pub async fn get_missing_sessions( &self, users: impl Iterator, - ) -> HashMap> { + ) -> BTreeMap> { let mut olm = self.olm.lock().await; match &mut *olm { Some(o) => o.get_missing_sessions(users).await, - None => HashMap::new(), + None => BTreeMap::new(), } } diff --git a/src/crypto/device.rs b/src/crypto/device.rs index 87ad25c4..6eb69b70 100644 --- a/src/crypto/device.rs +++ b/src/crypto/device.rs @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -use std::collections::HashMap; +use std::collections::BTreeMap; use std::mem; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Arc; @@ -29,7 +29,7 @@ pub struct Device { user_id: Arc, device_id: Arc, algorithms: Arc>, - keys: Arc>, + keys: Arc>, display_name: Arc>, deleted: Arc, trust_state: Arc>, @@ -68,7 +68,7 @@ impl Device { display_name: Option, trust_state: TrustState, algorithms: Vec, - keys: HashMap, + keys: BTreeMap, ) -> Self { Device { user_id: Arc::new(user_id), @@ -102,7 +102,7 @@ impl Device { } /// Get a map containing all the device keys. - pub fn keys(&self) -> &HashMap { + pub fn keys(&self) -> &BTreeMap { &self.keys } @@ -123,7 +123,7 @@ impl Device { /// Update a device with a new device keys struct. pub(crate) fn update_device(&mut self, device_keys: &DeviceKeys) { - let mut keys = HashMap::new(); + let mut keys = BTreeMap::new(); for (key_id, key) in device_keys.keys.iter() { let key_id = key_id.0; @@ -153,7 +153,7 @@ impl Device { impl From<&DeviceKeys> for Device { fn from(device_keys: &DeviceKeys) -> Self { - let mut keys = HashMap::new(); + let mut keys = BTreeMap::new(); for (key_id, key) in device_keys.keys.iter() { let key_id = key_id.0; diff --git a/src/crypto/machine.rs b/src/crypto/machine.rs index 3f7353c9..068dd5e6 100644 --- a/src/crypto/machine.rs +++ b/src/crypto/machine.rs @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -use std::collections::{HashMap, HashSet}; +use std::collections::{BTreeMap, HashMap, HashSet}; use std::convert::TryInto; use std::mem; #[cfg(feature = "sqlite-cryptostore")] @@ -42,7 +42,7 @@ use crate::events::{ AnyToDeviceEvent as ToDeviceEvent, ToDeviceEncrypted, ToDeviceForwardedRoomKey, ToDeviceRoomKey, ToDeviceRoomKeyRequest, }, - Algorithm, EventResult, EventType, + Algorithm, EventJson, EventType, }; use crate::identifiers::{DeviceId, RoomId, UserId}; @@ -50,14 +50,14 @@ use api::r0::keys; use api::r0::{ client_exchange::{send_event_to_device::Request as ToDeviceRequest, DeviceIdOrAllDevices}, keys::{AlgorithmAndDeviceId, DeviceKeys, KeyAlgorithm, OneTimeKey, SignedKey}, - sync::sync_events::IncomingResponse as SyncResponse, + sync::sync_events::Response as SyncResponse, }; use cjson; use serde_json::{json, Value}; use tracing::{debug, error, info, instrument, trace, warn}; -pub type OneTimeKeys = HashMap; +pub type OneTimeKeys = BTreeMap; #[derive(Debug)] pub struct OlmMachine { @@ -193,8 +193,8 @@ impl OlmMachine { pub async fn get_missing_sessions( &mut self, users: impl Iterator, - ) -> HashMap> { - let mut missing = HashMap::new(); + ) -> BTreeMap> { + let mut missing = BTreeMap::new(); for user_id in users { let user_devices = self.store.get_user_devices(user_id).await.unwrap(); @@ -216,7 +216,7 @@ impl OlmMachine { if is_missing { if !missing.contains_key(user_id) { - missing.insert(user_id.clone(), HashMap::new()); + missing.insert(user_id.clone(), BTreeMap::new()); } let user_map = missing.get_mut(user_id).unwrap(); @@ -472,7 +472,7 @@ impl OlmMachine { async fn device_keys(&self) -> DeviceKeys { let identity_keys = self.account.identity_keys(); - let mut keys = HashMap::new(); + let mut keys = BTreeMap::new(); keys.insert( AlgorithmAndDeviceId(KeyAlgorithm::Curve25519, self.device_id.clone()), @@ -490,9 +490,9 @@ impl OlmMachine { "keys": keys, }); - let mut signatures = HashMap::new(); + let mut signatures = BTreeMap::new(); - let mut signature = HashMap::new(); + let mut signature = BTreeMap::new(); signature.insert( AlgorithmAndDeviceId(KeyAlgorithm::Ed25519, self.device_id.clone()), self.sign_json(&device_keys).await, @@ -518,7 +518,7 @@ impl OlmMachine { async fn signed_one_time_keys(&self) -> StdResult { let _ = self.generate_one_time_keys().await?; let one_time_keys = self.account.one_time_keys().await; - let mut one_time_key_map = HashMap::new(); + let mut one_time_key_map = BTreeMap::new(); for (key_id, key) in one_time_keys.curve25519().iter() { let key_json = json!({ @@ -527,14 +527,14 @@ impl OlmMachine { let signature = self.sign_json(&key_json).await; - let mut signature_map = HashMap::new(); + let mut signature_map = BTreeMap::new(); signature_map.insert( AlgorithmAndDeviceId(KeyAlgorithm::Ed25519, self.device_id.clone()), signature, ); - let mut signatures = HashMap::new(); + let mut signatures = BTreeMap::new(); signatures.insert(self.user_id.clone(), signature_map); let signed_key = SignedKey { @@ -711,7 +711,7 @@ impl OlmMachine { sender: &UserId, sender_key: &str, message: OlmMessage, - ) -> Result<(EventResult, String)> { + ) -> Result<(EventJson, String)> { // First try to decrypt using an existing session. let plaintext = if let Some(p) = self .try_decrypt_olm_event(sender, sender_key, &message) @@ -778,7 +778,7 @@ impl OlmMachine { &self, sender: &UserId, plaintext: &str, - ) -> Result<(EventResult, String)> { + ) -> Result<(EventJson, String)> { // TODO make the errors a bit more specific. let decrypted_json: Value = serde_json::from_str(&plaintext)?; @@ -793,13 +793,13 @@ impl OlmMachine { .ok_or(OlmError::MissingCiphertext)?; let recipient: UserId = serde_json::from_value(recipient)?; - let recipient_keys: HashMap = serde_json::from_value( + let recipient_keys: BTreeMap = serde_json::from_value( decrypted_json .get("recipient_keys") .cloned() .ok_or(OlmError::MissingCiphertext)?, )?; - let keys: HashMap = serde_json::from_value( + let keys: BTreeMap = serde_json::from_value( decrypted_json .get("keys") .cloned() @@ -823,7 +823,7 @@ impl OlmMachine { .ok_or(OlmError::MissingSigningKey)?; Ok(( - serde_json::from_value::>(decrypted_json)?, + serde_json::from_value::>(decrypted_json)?, signing_key.to_owned(), )) } @@ -840,7 +840,7 @@ impl OlmMachine { async fn decrypt_to_device_event( &mut self, event: &ToDeviceEncrypted, - ) -> Result> { + ) -> Result> { info!("Decrypting to-device event"); let content = if let EncryptedEventContent::OlmV1Curve25519AesSha2(c) = &event.content { @@ -1026,7 +1026,7 @@ impl OlmMachine { message_type: (message_type as u32).into(), }; - let mut content = HashMap::new(); + let mut content = BTreeMap::new(); content.insert(recipient_sender_key.to_owned(), ciphertext); @@ -1119,11 +1119,11 @@ impl OlmMachine { let mut message_vec = Vec::new(); for user_map_chunk in user_map.chunks(OlmMachine::MAX_TO_DEVICE_MESSAGES) { - let mut messages = HashMap::new(); + let mut messages = BTreeMap::new(); for (session, device) in user_map_chunk { if !messages.contains_key(device.user_id()) { - messages.insert(device.user_id().clone(), HashMap::new()); + messages.insert(device.user_id().clone(), BTreeMap::new()); }; let user_messages = messages.get_mut(device.user_id()).unwrap(); @@ -1139,7 +1139,7 @@ impl OlmMachine { user_messages.insert( DeviceIdOrAllDevices::DeviceId(device.device_id().clone()), - MessageEventContent::Encrypted(encrypted_content), + EventJson::from(MessageEventContent::Encrypted(encrypted_content)), ); } @@ -1167,9 +1167,9 @@ impl OlmMachine { &mut self, sender_key: &str, signing_key: &str, - event: &mut EventResult, + event: &mut EventJson, ) -> Result<()> { - let event = if let EventResult::Ok(e) = event { + let event = if let Ok(e) = event.deserialize() { e } else { warn!("Decrypted to-device event failed to be parsed correctly"); @@ -1177,9 +1177,11 @@ impl OlmMachine { }; match event { - ToDeviceEvent::RoomKey(e) => self.add_room_key(sender_key, signing_key, e).await, - ToDeviceEvent::ForwardedRoomKey(e) => { - self.add_forwarded_room_key(sender_key, signing_key, e) + ToDeviceEvent::RoomKey(mut e) => { + self.add_room_key(sender_key, signing_key, &mut e).await + } + ToDeviceEvent::ForwardedRoomKey(mut e) => { + self.add_forwarded_room_key(sender_key, signing_key, &mut e) } _ => { warn!("Received a unexpected encrypted to-device event"); @@ -1213,7 +1215,7 @@ impl OlmMachine { self.uploaded_signed_key_count = Some(count); for event_result in &mut response.to_device.events { - let event = if let EventResult::Ok(e) = &event_result { + let event = if let Ok(e) = event_result.deserialize() { e } else { // Skip invalid events. @@ -1223,7 +1225,7 @@ impl OlmMachine { info!("Received a to-device event {:?}", event); - match event { + match &event { ToDeviceEvent::RoomEncrypted(e) => { let decrypted_event = match self.decrypt_to_device_event(e).await { Ok(e) => e, @@ -1248,7 +1250,7 @@ impl OlmMachine { | ToDeviceEvent::KeyVerificationKey(..) | ToDeviceEvent::KeyVerificationMac(..) | ToDeviceEvent::KeyVerificationRequest(..) - | ToDeviceEvent::KeyVerificationStart(..) => self.handle_verification_event(event), + | ToDeviceEvent::KeyVerificationStart(..) => self.handle_verification_event(&event), _ => continue, } } @@ -1257,7 +1259,7 @@ impl OlmMachine { pub async fn decrypt_room_event( &mut self, event: &EncryptedEvent, - ) -> Result> { + ) -> Result> { let content = match &event.content { EncryptedEventContent::MegolmV1AesSha2(c) => c, _ => return Err(OlmError::UnsupportedAlgorithm), @@ -1281,15 +1283,24 @@ impl OlmMachine { .as_object_mut() .ok_or(OlmError::NotAnObject)?; - let server_ts: u64 = event.origin_server_ts.into(); + // TODO better number conversion here. + let server_ts = event + .origin_server_ts + .duration_since(std::time::SystemTime::UNIX_EPOCH) + .unwrap_or_default() + .as_millis(); + let server_ts: i64 = server_ts.try_into().unwrap_or_default(); decrypted_object.insert("sender".to_owned(), event.sender.to_string().into()); decrypted_object.insert("event_id".to_owned(), event.event_id.to_string().into()); decrypted_object.insert("origin_server_ts".to_owned(), server_ts.into()); - decrypted_object.insert("unsigned".to_owned(), event.unsigned.clone().into()); + decrypted_object.insert( + "unsigned".to_owned(), + serde_json::to_value(&event.unsigned).unwrap_or_default(), + ); - let decrypted_event = serde_json::from_value::>(decrypted_value)?; + let decrypted_event = serde_json::from_value::>(decrypted_value)?; trace!("Successfully decrypted megolm event {:?}", decrypted_event); // TODO set the encryption info on the event (is it verified, was it // decrypted, sender key...) diff --git a/src/crypto/olm.rs b/src/crypto/olm.rs index 3d6d4ac4..64e247af 100644 --- a/src/crypto/olm.rs +++ b/src/crypto/olm.rs @@ -623,7 +623,7 @@ pub(crate) mod test { use crate::identifiers::RoomId; use olm_rs::session::OlmMessage; use ruma_client_api::r0::keys::SignedKey; - use std::collections::HashMap; + use std::collections::BTreeMap; use std::convert::TryFrom; pub(crate) async fn get_account_and_session() -> (Account, Session) { @@ -643,7 +643,7 @@ pub(crate) mod test { .to_owned(); let one_time_key = SignedKey { key: one_time_key, - signatures: HashMap::new(), + signatures: BTreeMap::new(), }; let sender_key = bob.identity_keys().curve25519().to_owned(); let session = alice @@ -721,7 +721,7 @@ pub(crate) mod test { let one_time_key = SignedKey { key: one_time_key, - signatures: HashMap::new(), + signatures: BTreeMap::new(), }; let mut bob_session = bob diff --git a/src/crypto/store/sqlite.rs b/src/crypto/store/sqlite.rs index 5f768e18..2c92d4fd 100644 --- a/src/crypto/store/sqlite.rs +++ b/src/crypto/store/sqlite.rs @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -use std::collections::{HashMap, HashSet}; +use std::collections::{BTreeMap, HashSet}; use std::convert::TryFrom; use std::mem; use std::path::{Path, PathBuf}; @@ -348,7 +348,7 @@ impl SqliteStore { .fetch_all(&mut *connection) .await?; - let mut keys = HashMap::new(); + let mut keys = BTreeMap::new(); for row in key_rows { let algorithm = if let Ok(a) = KeyAlgorithm::try_from(&row.0 as &str) { @@ -643,7 +643,7 @@ mod test { use crate::crypto::device::test::get_device; use crate::crypto::olm::GroupSessionKey; use olm_rs::outbound_group_session::OlmOutboundGroupSession; - use std::collections::HashMap; + use std::collections::BTreeMap; use tempfile::tempdir; use super::{ @@ -709,7 +709,7 @@ mod test { .to_owned(); let one_time_key = SignedKey { key: one_time_key, - signatures: HashMap::new(), + signatures: BTreeMap::new(), }; let sender_key = bob.identity_keys().curve25519().to_owned(); let session = alice diff --git a/src/models/room.rs b/src/models/room.rs index a12405aa..06d9c69a 100644 --- a/src/models/room.rs +++ b/src/models/room.rs @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -use std::collections::HashMap; +use std::collections::{BTreeMap, HashMap}; use std::convert::TryFrom; use super::RoomMember; @@ -63,7 +63,7 @@ pub struct PowerLevels { /// The level required to send specific event types. /// /// This is a mapping from event type to power level required. - pub events: HashMap, + pub events: BTreeMap, /// The default level required to send message events. pub events_default: Int, /// The level required to invite a user. diff --git a/src/request_builder.rs b/src/request_builder.rs index 795e8534..8d61d05d 100644 --- a/src/request_builder.rs +++ b/src/request_builder.rs @@ -1,5 +1,6 @@ use crate::api; use crate::events::room::power_levels::PowerLevelsEventContent; +use crate::events::EventJson; use crate::identifiers::{RoomId, UserId}; use api::r0::filter::RoomEventFilter; use api::r0::membership::Invite3pid; @@ -163,7 +164,7 @@ impl Into for RoomBuilder { invite_3pid: self.invite_3pid, is_direct: self.is_direct, name: self.name, - power_level_content_override: self.power_level_content_override, + power_level_content_override: self.power_level_content_override.map(EventJson::from), preset: self.preset, room_alias_name: self.room_alias_name, room_version: self.room_version, @@ -177,6 +178,7 @@ impl Into for RoomBuilder { /// /// # Examples /// ``` +/// # use std::convert::TryFrom; /// # use matrix_sdk::{AsyncClient, MessagesRequestBuilder}; /// # use matrix_sdk::api::r0::message::get_message_events::{self, Direction}; /// # use matrix_sdk::identifiers::RoomId; @@ -184,8 +186,8 @@ impl Into for RoomBuilder { /// # let homeserver = Url::parse("http://example.com").unwrap(); /// # let mut rt = tokio::runtime::Runtime::new().unwrap(); /// # rt.block_on(async { -/// # let room_id = RoomId::new(homeserver.as_str()).unwrap(); -/// # let last_sync_token = "".to_string();; +/// # let room_id = RoomId::try_from("!test:localhost").unwrap(); +/// # let last_sync_token = "".to_string(); /// let mut cli = AsyncClient::new(homeserver, None).unwrap(); /// /// let mut builder = MessagesRequestBuilder::new(); @@ -288,7 +290,7 @@ impl Into for MessagesRequestBuilder { #[cfg(test)] mod test { - use std::collections::HashMap; + use std::collections::{BTreeMap, HashMap}; use super::*; use crate::events::room::power_levels::NotificationPowerLevels; @@ -325,7 +327,7 @@ mod test { .is_direct(true) .power_level_override(PowerLevelsEventContent { ban: Int::max_value(), - events: HashMap::default(), + events: BTreeMap::default(), events_default: Int::min_value(), invite: Int::min_value(), kick: Int::min_value(), @@ -335,7 +337,7 @@ mod test { notifications: NotificationPowerLevels { room: Int::min_value(), }, - users: HashMap::default(), + users: BTreeMap::default(), }) .preset(RoomPreset::PrivateChat) .room_alias_name("room_alias") diff --git a/src/test_builder.rs b/src/test_builder.rs index 4849cfb1..ff637b1c 100644 --- a/src/test_builder.rs +++ b/src/test_builder.rs @@ -10,7 +10,7 @@ use crate::events::{ only::Event, }, presence::PresenceEvent, - EventResult, TryFromRaw, + EventJson, TryFromRaw, }; use crate::identifiers::{RoomId, UserId}; use crate::AsyncClient; @@ -97,9 +97,9 @@ impl EventBuilder { ) -> Self { let val = fs::read_to_string(path.as_ref()) .expect(&format!("file not found {:?}", path.as_ref())); - let event = serde_json::from_str::>(&val) + let event = serde_json::from_str::>(&val) .unwrap() - .into_result() + .deserialize() .unwrap(); self.ephemeral.push(variant(event)); self @@ -113,9 +113,9 @@ impl EventBuilder { ) -> Self { let val = fs::read_to_string(path.as_ref()) .expect(&format!("file not found {:?}", path.as_ref())); - let event = serde_json::from_str::>(&val) + let event = serde_json::from_str::>(&val) .unwrap() - .into_result() + .deserialize() .unwrap(); self.account_data.push(variant(event)); self @@ -129,9 +129,9 @@ impl EventBuilder { ) -> Self { let val = fs::read_to_string(path.as_ref()) .expect(&format!("file not found {:?}", path.as_ref())); - let event = serde_json::from_str::>(&val) + let event = serde_json::from_str::>(&val) .unwrap() - .into_result() + .deserialize() .unwrap(); self.room_events.push(variant(event)); self @@ -145,9 +145,9 @@ impl EventBuilder { ) -> Self { let val = fs::read_to_string(path.as_ref()) .expect(&format!("file not found {:?}", path.as_ref())); - let event = serde_json::from_str::>(&val) + let event = serde_json::from_str::>(&val) .unwrap() - .into_result() + .deserialize() .unwrap(); self.state_events.push(variant(event)); self @@ -157,9 +157,9 @@ impl EventBuilder { pub fn add_presence_event_from_file>(mut self, path: P) -> Self { let val = fs::read_to_string(path.as_ref()) .expect(&format!("file not found {:?}", path.as_ref())); - let event = serde_json::from_str::>(&val) + let event = serde_json::from_str::>(&val) .unwrap() - .into_result() + .deserialize() .unwrap(); self.presence_events.push(event); self @@ -344,7 +344,7 @@ impl ClientTestRunner { } for event in &self.room_events { - cli.receive_joined_timeline_event(room_id, &mut EventResult::Ok(event.clone())) + cli.receive_joined_timeline_event(room_id, &mut EventJson::from(event.clone())) .await; } for event in &self.presence_events {