From edcad6f5d5f2513db4cc2d2b6f558e4d439e570b Mon Sep 17 00:00:00 2001 From: Floris Bruynooghe Date: Wed, 2 Sep 2020 20:32:45 +0200 Subject: [PATCH] Use PartialEq on SecureJoinStep --- src/securejoin.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/securejoin.rs b/src/securejoin.rs index 06b893616..d907a0680 100644 --- a/src/securejoin.rs +++ b/src/securejoin.rs @@ -98,7 +98,7 @@ pub(crate) struct Bob { } /// The next message expected by [Bob] in the setup-contact/secure-join protocol. -#[derive(Debug)] +#[derive(Debug, PartialEq)] enum SecureJoinStep { /// No setup-contact protocol running. NotActive, @@ -573,7 +573,7 @@ pub(crate) async fn handle_securejoin_handshake( let bob = context.bob.read().await; let scan = bob.qr_scan.as_ref(); scan.is_none() - || !matches!(bob.expects, SecureJoinStep::AuthRequired) + || bob.expects != SecureJoinStep::AuthRequired || join_vg && scan.unwrap().state != LotState::QrAskVerifyGroup }; @@ -761,10 +761,7 @@ pub(crate) async fn handle_securejoin_handshake( HandshakeMessage::Ignore }; - if !matches!( - context.bob.read().await.expects, - SecureJoinStep::ContactConfirm - ) { + if context.bob.read().await.expects != SecureJoinStep::ContactConfirm { info!(context, "Message belongs to a different handshake.",); return Ok(abort_retval); }