From 00ee5da234966157cc1b389c15eea69a49826aa7 Mon Sep 17 00:00:00 2001 From: K Panuragh Date: Sun, 8 Nov 2026 20:15:50 +0530 Subject: [PATCH] daemon: rename internal SelectCredential states to SelectingCredential NfcStateInternal and UsbStateInternal still used the old name after the public NfcState/UsbState variants were renamed in 154e50f. Use the -ing form like the other states. Refs #77 --- credentialsd/src/credential_service/nfc.rs | 8 ++++---- credentialsd/src/credential_service/usb.rs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/credentialsd/src/credential_service/nfc.rs b/credentialsd/src/credential_service/nfc.rs index 438a632..a783a50 100644 --- a/credentialsd/src/credential_service/nfc.rs +++ b/credentialsd/src/credential_service/nfc.rs @@ -151,7 +151,7 @@ impl InProcessNfcHandler { ), )) } else { - Ok(NfcStateInternal::SelectCredential { + Ok(NfcStateInternal::SelectingCredential { response: get_assertion_response, cred_tx: cred_tx.clone(), }) @@ -203,7 +203,7 @@ impl InProcessNfcHandler { | NfcStateInternal::NeedsUserVerification { .. } => { Self::process_user_interaction(&mut signal_rx, &cred_tx).await } - NfcStateInternal::SelectCredential { + NfcStateInternal::SelectingCredential { ref response, cred_tx: _, } => Self::process_select_credential(response, &mut cred_rx).await, @@ -449,7 +449,7 @@ pub(super) enum NfcStateInternal { NeedsUserVerification { attempts_left: Option }, /// Multiple credentials have been found and the user has to select which to use - SelectCredential { + SelectingCredential { response: GetAssertionResponse, cred_tx: mpsc::Sender, }, @@ -532,7 +532,7 @@ impl From for NfcState { } NfcStateInternal::Completed(_) => NfcState::Completed, NfcStateInternal::Restarting => NfcState::Restarting, - NfcStateInternal::SelectCredential { response, cred_tx } => { + NfcStateInternal::SelectingCredential { response, cred_tx } => { NfcState::SelectingCredential { creds: response .assertions diff --git a/credentialsd/src/credential_service/usb.rs b/credentialsd/src/credential_service/usb.rs index 1207833..2baff90 100644 --- a/credentialsd/src/credential_service/usb.rs +++ b/credentialsd/src/credential_service/usb.rs @@ -254,7 +254,7 @@ impl InProcessUsbHandler { ), )) } else { - Ok(UsbStateInternal::SelectCredential { + Ok(UsbStateInternal::SelectingCredential { response: get_assertion_response, cred_tx: cred_tx.clone(), }) @@ -310,7 +310,7 @@ impl InProcessUsbHandler { | UsbStateInternal::NeedsUserPresence => { Self::process_user_interaction(&mut signal_rx, &cred_tx).await } - UsbStateInternal::SelectCredential { + UsbStateInternal::SelectingCredential { ref response, cred_tx: _, } => Self::process_select_credential(response, &mut cred_rx).await, @@ -559,7 +559,7 @@ pub(super) enum UsbStateInternal { NeedsUserPresence, /// Multiple credentials have been found and the user has to select which to use - SelectCredential { + SelectingCredential { response: GetAssertionResponse, cred_tx: mpsc::Sender, }, @@ -652,7 +652,7 @@ impl From for UsbState { UsbStateInternal::NeedsUserPresence => UsbState::NeedsUserPresence, UsbStateInternal::Completed(_) => UsbState::Completed, UsbStateInternal::SelectingDevice(_) => UsbState::SelectingDevice, - UsbStateInternal::SelectCredential { response, cred_tx } => { + UsbStateInternal::SelectingCredential { response, cred_tx } => { UsbState::SelectingCredential { creds: response .assertions