char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto: More lint fixes.

master
Damir Jelić 2020-04-30 14:29:58 +02:00
parent 3bcce962e3
commit e109e01a28
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix_sdk_crypto/src/lib.rs
View File

@ -25,4 +25,8 @@ mod store;
pub use device::{Device, TrustState}; pub use device::{Device, TrustState};
pub use error::{MegolmError, OlmError}; pub use error::{MegolmError, OlmError};
pub use machine::{OlmMachine, OneTimeKeys}; pub use machine::{OlmMachine, OneTimeKeys};
pub use memory_stores::{DeviceStore, GroupSessionStore, SessionStore, UserDevices};
pub use olm::{Account, InboundGroupSession, OutboundGroupSession, Session};
#[cfg(feature = "sqlite-cryptostore")]
pub use store::sqlite::SqliteStore;
pub use store::{CryptoStore, CryptoStoreError}; pub use store::{CryptoStore, CryptoStoreError};

8
matrix_sdk_crypto/src/machine.rs
View File

@ -30,8 +30,8 @@ use super::olm::{
}; };
use super::store::memorystore::MemoryStore; use super::store::memorystore::MemoryStore;
#[cfg(feature = "sqlite-cryptostore")] #[cfg(feature = "sqlite-cryptostore")]
use super::store::sqlite::SqliteStore; use super::store::{sqlite::SqliteStore, Result as StoreError};
use super::{device::Device, store::Result as StoreError, CryptoStore}; use super::{device::Device, CryptoStore};
use matrix_sdk_types::api; use matrix_sdk_types::api;
use matrix_sdk_types::events::{ use matrix_sdk_types::events::{
@ -1467,10 +1467,10 @@ mod test {
to_device_request to_device_request
.messages .messages
.values() .values()
.nth(0) .next()
.unwrap() .unwrap()
.values() .values()
.nth(0) .next()
.unwrap() .unwrap()
.json() .json()
.get(), .get(),

6
matrix_sdk_crypto/src/memory_stores.rs
View File

@ -23,7 +23,7 @@ use super::olm::{InboundGroupSession, Session};
use matrix_sdk_types::identifiers::{DeviceId, RoomId, UserId}; use matrix_sdk_types::identifiers::{DeviceId, RoomId, UserId};
/// In-memory store for Olm Sessions. /// In-memory store for Olm Sessions.
#[derive(Debug)] #[derive(Debug, Default)]
pub struct SessionStore { pub struct SessionStore {
entries: HashMap<String, Arc<Mutex<Vec<Session>>>>, entries: HashMap<String, Arc<Mutex<Vec<Session>>>>,
} }
@ -69,7 +69,7 @@ impl SessionStore {
} }
} }
#[derive(Debug)] #[derive(Debug, Default)]
/// In-memory store that houlds inbound group sessions. /// In-memory store that houlds inbound group sessions.
pub struct GroupSessionStore { pub struct GroupSessionStore {
entries: HashMap<RoomId, HashMap<String, HashMap<String, InboundGroupSession>>>, entries: HashMap<RoomId, HashMap<String, HashMap<String, InboundGroupSession>>>,
@ -127,7 +127,7 @@ impl GroupSessionStore {
} }
/// In-memory store holding the devices of users. /// In-memory store holding the devices of users.
#[derive(Clone, Debug)] #[derive(Clone, Debug, Default)]
pub struct DeviceStore { pub struct DeviceStore {
entries: Arc<DashMap<UserId, DashMap<String, Device>>>, entries: Arc<DashMap<UserId, DashMap<String, Device>>>,
} }