fix(apeerstate): fix key peeking logic

This commit is contained in:
dignifiedquire
2019-05-14 15:49:20 +02:00
parent c399f0689a
commit 1f562357e2

View File

@@ -273,8 +273,8 @@ pub unsafe fn dc_apeerstate_peek_key<'a>(
min_verified: libc::c_int, min_verified: libc::c_int,
) -> Option<&'a Key> { ) -> Option<&'a Key> {
if peerstate.public_key.is_none() if peerstate.public_key.is_none()
&& !peerstate.gossip_key.is_none() && peerstate.gossip_key.is_none()
&& !peerstate.verified_key.is_none() && peerstate.verified_key.is_none()
{ {
return None; return None;
} }
@@ -282,7 +282,7 @@ pub unsafe fn dc_apeerstate_peek_key<'a>(
if 0 != min_verified { if 0 != min_verified {
return peerstate.verified_key.as_ref(); return peerstate.verified_key.as_ref();
} }
if !peerstate.public_key.is_none() { if peerstate.public_key.is_some() {
return peerstate.public_key.as_ref(); return peerstate.public_key.as_ref();
} }