From cdf3635686fb83c2b87eb5c8d5076a53c0265227 Mon Sep 17 00:00:00 2001 From: Sergiu Puhalschi Date: Thu, 20 Feb 2025 09:17:45 +0200 Subject: [PATCH] PR review --- .../device_mnemonic_builder.rs | 20 ++++++------- .../device_mnemonic_builder.rs | 28 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/crates/system/os/factors/src/add_factor_source/device_mnemonic_builder.rs b/crates/system/os/factors/src/add_factor_source/device_mnemonic_builder.rs index 2105b2d98..072558b1c 100644 --- a/crates/system/os/factors/src/add_factor_source/device_mnemonic_builder.rs +++ b/crates/system/os/factors/src/add_factor_source/device_mnemonic_builder.rs @@ -7,9 +7,9 @@ pub struct DeviceMnemonicBuilder { mnemonic_with_passphrase: RwLock>, } -/// The result of the `build` function from `DeviceMnemonicBuilder`. +/// The outcome of the `build` function from `DeviceMnemonicBuilder`. #[derive(Debug, PartialEq)] -pub enum DeviceMnemonicBuildResult { +pub enum DeviceMnemonicBuildOutcome { /// The mnemonic words were confirmed Confirmed { mnemonic_with_passphrase: MnemonicWithPassphrase, @@ -190,11 +190,11 @@ impl DeviceMnemonicBuilder { pub fn build( &self, words_to_confirm: &HashMap, - ) -> DeviceMnemonicBuildResult { + ) -> DeviceMnemonicBuildOutcome { if words_to_confirm.len() != Self::NUMBER_OF_WORDS_OF_MNEMONIC_USER_NEED_TO_CONFIRM { - return DeviceMnemonicBuildResult::ConfirmationWordCountMismatch; + return DeviceMnemonicBuildOutcome::ConfirmationWordCountMismatch; } let unconfirmed_indices_in_mnemonic = words_to_confirm @@ -209,11 +209,11 @@ impl DeviceMnemonicBuilder { .collect::>(); if unconfirmed_indices_in_mnemonic.is_empty() { - DeviceMnemonicBuildResult::Confirmed { + DeviceMnemonicBuildOutcome::Confirmed { mnemonic_with_passphrase: self.get_mnemonic_with_passphrase(), } } else { - DeviceMnemonicBuildResult::Unconfirmed { + DeviceMnemonicBuildOutcome::Unconfirmed { indices_in_mnemonic: unconfirmed_indices_in_mnemonic, } } @@ -378,7 +378,7 @@ mod tests { pretty_assertions::assert_eq!( sut.build(&words_to_confirm), - DeviceMnemonicBuildResult::ConfirmationWordCountMismatch + DeviceMnemonicBuildOutcome::ConfirmationWordCountMismatch ); } @@ -396,7 +396,7 @@ mod tests { pretty_assertions::assert_eq!( sut.build(&words_to_confirm), - DeviceMnemonicBuildResult::Unconfirmed { + DeviceMnemonicBuildOutcome::Unconfirmed { indices_in_mnemonic: indexset![0, 1, 2, 3] } ); @@ -416,7 +416,7 @@ mod tests { pretty_assertions::assert_eq!( sut.build(&words_to_confirm), - DeviceMnemonicBuildResult::Unconfirmed { + DeviceMnemonicBuildOutcome::Unconfirmed { indices_in_mnemonic: indexset![7, 13] } ); @@ -438,7 +438,7 @@ mod tests { pretty_assertions::assert_eq!( result, - DeviceMnemonicBuildResult::Confirmed { + DeviceMnemonicBuildOutcome::Confirmed { mnemonic_with_passphrase: MnemonicWithPassphrase::sample() } ); diff --git a/crates/uniffi/uniffi_SPLIT_ME/src/system/sargon_os/add_factor_source/device_mnemonic_builder.rs b/crates/uniffi/uniffi_SPLIT_ME/src/system/sargon_os/add_factor_source/device_mnemonic_builder.rs index 146a0c8e9..6a0c41bae 100644 --- a/crates/uniffi/uniffi_SPLIT_ME/src/system/sargon_os/add_factor_source/device_mnemonic_builder.rs +++ b/crates/uniffi/uniffi_SPLIT_ME/src/system/sargon_os/add_factor_source/device_mnemonic_builder.rs @@ -1,5 +1,5 @@ use crate::prelude::*; -use sargon::DeviceMnemonicBuildResult as InternalDeviceMnemonicBuildResult; +use sargon::DeviceMnemonicBuildOutcome as InternalDeviceMnemonicBuildOutcome; use sargon::DeviceMnemonicBuilder as InternalDeviceMnemonicBuilder; /// A builder of `MnemonicWithPassphrase` required for a new `DeviceFactorSource` creation. @@ -10,9 +10,9 @@ pub struct DeviceMnemonicBuilder { wrapped: Arc, } -/// The result of the `build` function from `DeviceMnemonicBuilder`. +/// The outcome of the `build` function from `DeviceMnemonicBuilder`. #[derive(Debug, PartialEq, uniffi::Enum)] -pub enum DeviceMnemonicBuildResult { +pub enum DeviceMnemonicBuildOutcome { /// The mnemonic words were confirmed Confirmed { mnemonic_with_passphrase: MnemonicWithPassphrase, @@ -23,18 +23,18 @@ pub enum DeviceMnemonicBuildResult { Unconfirmed { indices_in_mnemonic: Vec }, } -impl From for DeviceMnemonicBuildResult { - fn from(value: InternalDeviceMnemonicBuildResult) -> Self { +impl From for DeviceMnemonicBuildOutcome { + fn from(value: InternalDeviceMnemonicBuildOutcome) -> Self { match value { - InternalDeviceMnemonicBuildResult::Confirmed { + InternalDeviceMnemonicBuildOutcome::Confirmed { mnemonic_with_passphrase, - } => DeviceMnemonicBuildResult::Confirmed { + } => DeviceMnemonicBuildOutcome::Confirmed { mnemonic_with_passphrase: mnemonic_with_passphrase.into(), }, - InternalDeviceMnemonicBuildResult::ConfirmationWordCountMismatch => DeviceMnemonicBuildResult::ConfirmationWordCountMismatch, - InternalDeviceMnemonicBuildResult::Unconfirmed { + InternalDeviceMnemonicBuildOutcome::ConfirmationWordCountMismatch => DeviceMnemonicBuildOutcome::ConfirmationWordCountMismatch, + InternalDeviceMnemonicBuildOutcome::Unconfirmed { indices_in_mnemonic, - } => DeviceMnemonicBuildResult::Unconfirmed { + } => DeviceMnemonicBuildOutcome::Unconfirmed { indices_in_mnemonic: indices_in_mnemonic .into_iter() .map(|i| i as u8) @@ -151,7 +151,7 @@ impl DeviceMnemonicBuilder { pub fn build( self: Arc, words_to_confirm: HashMap, - ) -> DeviceMnemonicBuildResult { + ) -> DeviceMnemonicBuildOutcome { self.wrapped .build( &words_to_confirm @@ -208,7 +208,7 @@ mod tests { pretty_assertions::assert_eq!( r0, - DeviceMnemonicBuildResult::ConfirmationWordCountMismatch + DeviceMnemonicBuildOutcome::ConfirmationWordCountMismatch ); let r1 = sut.clone().build( @@ -224,7 +224,7 @@ mod tests { pretty_assertions::assert_eq!( r1, - DeviceMnemonicBuildResult::Unconfirmed { + DeviceMnemonicBuildOutcome::Unconfirmed { indices_in_mnemonic: vec![5, 11, 17] } ); @@ -238,7 +238,7 @@ mod tests { pretty_assertions::assert_eq!( r2, - DeviceMnemonicBuildResult::Confirmed { + DeviceMnemonicBuildOutcome::Confirmed { mnemonic_with_passphrase: sargon::MnemonicWithPassphrase::sample_device().into(), }