From f7c7f414edeb0d0687b701f17de9dec718a41c59 Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Sun, 14 Jun 2020 21:51:53 +0300 Subject: [PATCH] refactor: remove .unwrap() from Peerstate.has_verified_key() --- src/peerstate.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/peerstate.rs b/src/peerstate.rs index ab4ac2953..27ff74861 100644 --- a/src/peerstate.rs +++ b/src/peerstate.rs @@ -450,14 +450,11 @@ impl<'a> Peerstate<'a> { } pub fn has_verified_key(&self, fingerprints: &HashSet) -> bool { - if self.verified_key.is_some() && self.verified_key_fingerprint.is_some() { - let vkc = self.verified_key_fingerprint.as_ref().unwrap(); - if fingerprints.contains(vkc) { - return true; - } + if let Some(vkc) = &self.verified_key_fingerprint { + fingerprints.contains(vkc) && self.verified_key.is_some() + } else { + false } - - false } }