Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 09:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove .unwrap() from Peerstate.has_verified_key()

Browse Source
This commit is contained in:
Alexander Krotov
2020-06-14 21:51:53 +03:00
committed by link2xt
parent 23d6012c1f
commit f7c7f414ed
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/peerstate.rs
View File

@@ -450,16 +450,13 @@ impl<'a> Peerstate<'a> {
} }
pub fn has_verified_key(&self, fingerprints: &HashSet<Fingerprint>) -> bool { pub fn has_verified_key(&self, fingerprints: &HashSet<Fingerprint>) -> bool {
if self.verified_key.is_some() && self.verified_key_fingerprint.is_some() { if let Some(vkc) = &self.verified_key_fingerprint {
let vkc = self.verified_key_fingerprint.as_ref().unwrap(); fingerprints.contains(vkc) && self.verified_key.is_some()
if fingerprints.contains(vkc) { } else {
return true;
}
}
false false
} }
} }
}
impl From<crate::key::FingerprintError> for rusqlite::Error { impl From<crate::key::FingerprintError> for rusqlite::Error {
fn from(_source: crate::key::FingerprintError) -> Self { fn from(_source: crate::key::FingerprintError) -> Self {