From b7d465fabebd2290e4972827b10d2726c29a4699 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Mon, 5 Apr 2021 20:21:59 +0200 Subject: [PATCH] Upgrade ruma --- Cargo.toml | 13 +++++-------- benches/state_res_bench.rs | 13 +++++-------- src/event_auth.rs | 4 ++-- src/lib.rs | 5 +---- src/room_version.rs | 2 +- src/state_store.rs | 2 +- tests/event_sorting.rs | 5 +---- tests/res_with_auth_ids.rs | 5 +---- tests/state_res.rs | 2 +- tests/utils.rs | 5 +++-- 10 files changed, 21 insertions(+), 35 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9c88672b..92dc5ea8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,16 +19,13 @@ maplit = "1.0.2" thiserror = "1.0.22" log = "0.4.11" +[features] +unstable-pre-spec = ["ruma/unstable-pre-spec"] + [dependencies.ruma] git = "https://github.com/ruma/ruma" -#branch = "server-pdu" -#path = "../ruma/ruma" -rev = "f196f5b6f164973d6b343af31ab4e0457f743675" -features = ["client-api", "federation-api", "appservice-api", "unstable-pre-spec", "unstable-synapse-quirks"] - -[features] -default = ["unstable-pre-spec"] -unstable-pre-spec = ["ruma/unstable-pre-spec"] +rev = "d883debe072086efffd4255dcca0a1a0d6fcd9ce" +features = ["events", "signatures"] [dev-dependencies] criterion = "0.3.3" diff --git a/benches/state_res_bench.rs b/benches/state_res_bench.rs index 71732fde..b17f984e 100644 --- a/benches/state_res_bench.rs +++ b/benches/state_res_bench.rs @@ -16,7 +16,7 @@ use ruma::{ }, EventType, }, - identifiers::{EventId, RoomId, RoomVersionId, UserId}, + EventId, RoomId, RoomVersionId, UserId, }; use serde_json::{json, Value as JsonValue}; use state_res::{Error, Event, Result, StateMap, StateResolution, StateStore}; @@ -498,7 +498,7 @@ pub mod event { }, serde::CanonicalJsonValue, signatures::reference_hash, - EventId, RoomId, RoomVersionId, ServerName, UInt, UserId, + EventId, RoomId, RoomVersionId, ServerName, ServerSigningKeyId, UInt, UserId, }; use serde::{de, ser, Deserialize, Serialize}; use serde_json::{value::RawValue as RawJsonValue, Value as JsonValue}; @@ -546,9 +546,7 @@ pub mod event { fn hashes(&self) -> &EventHash { self.hashes() } - fn signatures( - &self, - ) -> BTreeMap, BTreeMap> { + fn signatures(&self) -> BTreeMap, BTreeMap> { self.signatures() } fn unsigned(&self) -> &BTreeMap { @@ -675,9 +673,8 @@ pub mod event { | EventType::RoomJoinRules | EventType::RoomCreate => event.state_key == Some("".into()), EventType::RoomMember => { + // TODO fix clone if let Ok(content) = - // TODO fix clone - serde_json::from_value::(event.content.clone()) { if [MembershipState::Leave, MembershipState::Ban] @@ -817,7 +814,7 @@ pub mod event { pub fn signatures( &self, - ) -> BTreeMap, BTreeMap> { + ) -> BTreeMap, BTreeMap> { match self { Self::Full(_, ev) => match ev { Pdu::RoomV1Pdu(_) => maplit::btreemap! {}, diff --git a/src/event_auth.rs b/src/event_auth.rs index ae42bb55..9d6a9611 100644 --- a/src/event_auth.rs +++ b/src/event_auth.rs @@ -11,7 +11,7 @@ use ruma::{ }, EventType, }, - identifiers::{RoomVersionId, UserId}, + RoomVersionId, UserId, }; use crate::{Error, Event, Result, StateMap}; @@ -762,7 +762,7 @@ pub fn get_send_level( }) .ok() }) - .map(|int| i64::from(int)) + .map(i64::from) .unwrap_or_else(|| if state_key.is_some() { 50 } else { 0 }) } diff --git a/src/lib.rs b/src/lib.rs index a5c94d9b..ac621b1b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,10 +6,7 @@ use std::{ }; use maplit::btreeset; -use ruma::{ - events::EventType, - identifiers::{EventId, RoomId, RoomVersionId}, -}; +use ruma::{events::EventType, EventId, RoomId, RoomVersionId}; mod error; pub mod event_auth; diff --git a/src/room_version.rs b/src/room_version.rs index 1cf86b92..a8db26ea 100644 --- a/src/room_version.rs +++ b/src/room_version.rs @@ -1,4 +1,4 @@ -use ruma::identifiers::RoomVersionId; +use ruma::RoomVersionId; pub enum RoomDisposition { /// A room version that has a stable specification. diff --git a/src/state_store.rs b/src/state_store.rs index ada65caa..b8a1ea88 100644 --- a/src/state_store.rs +++ b/src/state_store.rs @@ -1,6 +1,6 @@ use std::{collections::BTreeSet, sync::Arc}; -use ruma::identifiers::{EventId, RoomId}; +use ruma::{EventId, RoomId}; use crate::{Event, Result}; diff --git a/tests/event_sorting.rs b/tests/event_sorting.rs index a1a56904..81e7aefd 100644 --- a/tests/event_sorting.rs +++ b/tests/event_sorting.rs @@ -1,9 +1,6 @@ use std::collections::BTreeMap; -use ruma::{ - events::EventType, - identifiers::{EventId, RoomVersionId}, -}; +use ruma::{events::EventType, EventId, RoomVersionId}; use state_res::{is_power_event, StateMap}; mod utils; diff --git a/tests/res_with_auth_ids.rs b/tests/res_with_auth_ids.rs index de99ac4e..24af024f 100644 --- a/tests/res_with_auth_ids.rs +++ b/tests/res_with_auth_ids.rs @@ -2,10 +2,7 @@ use std::{collections::BTreeMap, sync::Arc}; -use ruma::{ - events::EventType, - identifiers::{EventId, RoomVersionId}, -}; +use ruma::{events::EventType, EventId, RoomVersionId}; use serde_json::json; use state_res::{EventMap, StateMap, StateResolution, StateStore}; diff --git a/tests/state_res.rs b/tests/state_res.rs index 9d72994d..36307926 100644 --- a/tests/state_res.rs +++ b/tests/state_res.rs @@ -3,7 +3,7 @@ use std::{sync::Arc, time::UNIX_EPOCH}; use maplit::btreemap; use ruma::{ events::{room::join_rules::JoinRule, EventType}, - identifiers::{EventId, RoomVersionId}, + EventId, RoomVersionId, }; use serde_json::json; use state_res::{StateMap, StateResolution, StateStore}; diff --git a/tests/utils.rs b/tests/utils.rs index 7c2f32cf..91d51838 100644 --- a/tests/utils.rs +++ b/tests/utils.rs @@ -15,7 +15,7 @@ use ruma::{ }, EventType, }, - identifiers::{EventId, RoomId, RoomVersionId, UserId}, + EventId, RoomId, RoomVersionId, UserId, }; use serde_json::{json, Value as JsonValue}; use state_res::{Error, Event, Result, StateMap, StateResolution, StateStore}; @@ -706,8 +706,8 @@ pub mod event { | EventType::RoomJoinRules | EventType::RoomCreate => event.state_key == Some("".into()), EventType::RoomMember => { + // TODO fix clone if let Ok(content) = - // TODO fix clone serde_json::from_value::(event.content.clone()) { if [MembershipState::Leave, MembershipState::Ban] @@ -921,6 +921,7 @@ pub mod event { } #[test] + #[cfg_attr(not(feature = "unstable-pre-spec"), ignore)] fn serialize_pdu() { let non_canonical_json = r#"{"auth_events": ["$FEKmyWTamMqoL3zkEC3mVPg3qkcXcUShxxaq5BltsCE", "$Oc8MYrZ3-eM4yBbhlj8YkYYluF9KHFDKU5uDpO-Ewcc", "$3ImCSXY6bbWbZ5S2N6BMplHHlP7RkxWZCM9fMbdM2NY", "$8Lfs0rVCE9bHQrUztEF9kbsrT4zASnPEtpImZN4L2n8"], "content": {"membership": "join"}, "depth": 135, "hashes": {"sha256": "Q7OehFJaB32W3NINZKesQZH7+ba7xZVFuyCtuWQ2emk"}, "origin": "pc.koesters.xyz:59003", "origin_server_ts": 1599901756522, "prev_events": ["$Oc8MYrZ3-eM4yBbhlj8YkYYluF9KHFDKU5uDpO-Ewcc"], "prev_state": [], "room_id": "!eGNyCFvnKcpsnIZiEV:koesters.xyz", "sender": "@timo:pc.koesters.xyz:59003", "state_key": "@timo:pc.koesters.xyz:59003", "type": "m.room.member", "signatures": {"koesters.xyz": {"ed25519:a_wwQy": "bb8T5haywaEXKNxUUjeNBfjYi/Qe32R/dGliduIs3Ct913WGzXYLjWh7xHqapie7viHPzkDw/KYJacpAYKvMBA"}, "pc.koesters.xyz:59003": {"ed25519:key1": "/B3tpaMZKoLNITrup4fbFhbIMWixxEKM49nS4MiKOFfyJjDGuC5nWsurw0m2eYzrffhkF5qQQ8+RlFvkqwqkBw"}}, "unsigned": {"age": 30, "replaces_state": "$Oc8MYrZ3-eM4yBbhlj8YkYYluF9KHFDKU5uDpO-Ewcc", "prev_content": {"membership": "join"}, "prev_sender": "@timo:pc.koesters.xyz:59003"}}"#;