Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-12 19:36:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify Peerstate.peek_key()

Browse Source
This commit is contained in:
Alexander Krotov
2020-02-07 21:11:52 +03:00
committed by holger krekel
parent fc0292bf8a
commit 0864e640ed
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/peerstate.rs
View File

@@ -335,18 +335,13 @@ impl<'a> Peerstate<'a> {
} }
pub fn peek_key(&self, min_verified: PeerstateVerifiedStatus) -> Option<&Key> { pub fn peek_key(&self, min_verified: PeerstateVerifiedStatus) -> Option<&Key> {
if self.public_key.is_none() && self.gossip_key.is_none() && self.verified_key.is_none() { match min_verified {
return None; PeerstateVerifiedStatus::BidirectVerified => self.verified_key.as_ref(),
PeerstateVerifiedStatus::Unverified => self
.public_key
.as_ref()
.or_else(|| self.gossip_key.as_ref()),
} }
if min_verified != PeerstateVerifiedStatus::Unverified {
return self.verified_key.as_ref();
}
if self.public_key.is_some() {
return self.public_key.as_ref();
}
self.gossip_key.as_ref()
} }
pub fn set_verified( pub fn set_verified(