Skip to content

Commit

Permalink
remove unnecessary changes
Browse files Browse the repository at this point in the history
  • Loading branch information
uhoreg committed Oct 3, 2023
1 parent 2a1c886 commit 58358bf
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 11 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion crates/matrix-sdk-crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ tracing = { workspace = true, features = ["attributes"] }
ulid = { version = "1.0.0", optional = true }
vodozemac = { workspace = true }
zeroize = { workspace = true, features = ["zeroize_derive"] }
once_cell.workspace = true

[target.'cfg(target_arch = "wasm32")'.dependencies]
tokio = { workspace = true }
Expand Down
5 changes: 1 addition & 4 deletions crates/matrix-sdk-crypto/src/backups/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -509,10 +509,7 @@ impl BackupMachine {
}

let key_count = sessions.len();
let (backup, session_record) = Self::backup_keys(
sessions,
backup_key,
).await;
let (backup, session_record) = Self::backup_keys(sessions, backup_key).await;

info!(
key_count = key_count,
Expand Down
6 changes: 3 additions & 3 deletions crates/matrix-sdk-crypto/src/olm/group_sessions/inbound.rs
Original file line number Diff line number Diff line change
Expand Up @@ -607,10 +607,10 @@ impl TryFrom<&DecryptedForwardedRoomKeyEvent> for InboundGroupSession {
#[cfg(test)]
mod test {
use matrix_sdk_test::async_test;
use ruma::{device_id, room_id, user_id, DeviceId, DeviceKeyAlgorithm, DeviceKeyId, UserId};
use vodozemac::{megolm::SessionOrdering, Curve25519PublicKey, Ed25519SecretKey};
use ruma::{device_id, room_id, user_id, DeviceId, UserId};
use vodozemac::{megolm::SessionOrdering, Curve25519PublicKey};

use crate::{olm::{utility::VerifyJson, InboundGroupSession}, ReadOnlyAccount};
use crate::{olm::InboundGroupSession, ReadOnlyAccount};

fn alice_id() -> &'static UserId {
user_id!("@alice:example.org")
Expand Down
4 changes: 2 additions & 2 deletions crates/matrix-sdk-crypto/src/olm/group_sessions/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ use crate::types::events::forwarded_room_key::ForwardedMegolmV2AesSha2Content;
use crate::types::{
deserialize_curve_key, deserialize_curve_key_vec,
events::forwarded_room_key::{ForwardedMegolmV1AesSha2Content, ForwardedRoomKeyContent},
serialize_curve_key, serialize_curve_key_vec, EventEncryptionAlgorithm,
SigningKey, SigningKeys,
serialize_curve_key, serialize_curve_key_vec, EventEncryptionAlgorithm, SigningKey,
SigningKeys,
};

/// An error type for the creation of group sessions.
Expand Down

0 comments on commit 58358bf

Please sign in to comment.