Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-02 05:22:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Avoid pointless conversions, just return the result

Browse Source
This commit is contained in:
Floris Bruynooghe
2020-02-05 22:57:37 +01:00
committed by Floris Bruynooghe
parent 4d0a08d858
commit 5c3a8819a4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/e2ee.rs
View File

@@ -198,15 +198,15 @@ fn load_or_generate_self_public_key(
self_addr: impl AsRef<str>,
) -> Result<SignedPublicKey> {
if let Some(key) = Key::from_self_public(context, &self_addr, &context.sql) {
return Ok(SignedPublicKey::try_from(key)
.map_err(|_| Error::Message("Not a public key".into()))?);
return SignedPublicKey::try_from(key)
.map_err(|_| Error::Message("Not a public key".into()));
}
let _guard = context.generating_key_mutex.lock().unwrap();
// Check again in case the key was generated while we were waiting for the lock.
if let Some(key) = Key::from_self_public(context, &self_addr, &context.sql) {
return Ok(SignedPublicKey::try_from(key)
.map_err(|_| Error::Message("Not a public key".into()))?);
return SignedPublicKey::try_from(key)
.map_err(|_| Error::Message("Not a public key".into()));
}
let start = std::time::Instant::now();