polish

radixdlt · Jan 23, 2025 · ec1c67a · ec1c67a
1 parent 9a77078
commit ec1c67a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/crates/crypto/hd/src/bip32/key_space/components/hardened.rs b/crates/crypto/hd/src/bip32/key_space/components/hardened.rs
@@ -148,6 +148,9 @@ impl FromGlobalKeySpace for Hardened {
     }
 }
 
+pub const HARDENED_SUFFIX_BIP32: &str = "H";
+pub const HARDENED_SUFFIX_BIP44: &str = "'";
+
 impl FromBIP32Str for Hardened {
     fn from_bip32_string(s: impl AsRef<str>) -> Result<Self> {
         let s = s.as_ref();

diff --git a/crates/crypto/hd/src/bip32/key_space/components/securified.rs b/crates/crypto/hd/src/bip32/key_space/components/securified.rs
@@ -147,8 +147,8 @@ impl SecurifiedU30 {
                 Self::SHORTHAND_SYNTAX_SUFFIX,
                 // We allow the unsecurified syntax as well - since that
                 // is what we get from the canonical BIP32 strings
-                UnsecurifiedHardened::VERBOSE_SYNTAX_SUFFIX,
-                UnsecurifiedHardened::SHORTHAND_SYNTAX_SUFFIX,
+                HARDENED_SUFFIX_BIP32,
+                HARDENED_SUFFIX_BIP44,
             ])?;
         let unoffsetted = offsetted
             .checked_sub(RELATIVELY_LOCAL_OFFSET_SECURIFIED)

diff --git a/crates/crypto/hd/src/bip32/key_space/components/unsecurified_hardened.rs b/crates/crypto/hd/src/bip32/key_space/components/unsecurified_hardened.rs
@@ -104,8 +104,8 @@ impl TryFrom<u32> for UnsecurifiedHardened {
 }
 
 impl IsPathComponentStringConvertible for UnsecurifiedHardened {
-    const VERBOSE_SYNTAX_SUFFIX: &'static str = "H";
-    const SHORTHAND_SYNTAX_SUFFIX: &'static str = "'";
+    const VERBOSE_SYNTAX_SUFFIX: &'static str = HARDENED_SUFFIX_BIP32;
+    const SHORTHAND_SYNTAX_SUFFIX: &'static str = HARDENED_SUFFIX_BIP44;
 }
 
 impl HasIndexInLocalKeySpace for UnsecurifiedHardened {

diff --git a/crates/crypto/hd/src/derivation/derivation_path.rs b/crates/crypto/hd/src/derivation/derivation_path.rs
@@ -81,8 +81,7 @@ macro_rules! path_union {
             impl FromBIP32Str for $union_name {
                 fn from_bip32_string(s: impl AsRef<str>) -> Result<Self> {
                     let s = s.as_ref();
-                    // Result::<Self>::Err(CommonError::InvalidBIP32Path { bad_value: s.to_owned() })
-                    Result::<Self>::Err(CommonError::InvalidDisplayNameEmpty)
+                    Result::<Self>::Err(CommonError::InvalidBIP32Path { bad_value: s.to_owned() })
                     $(
                         .or_else(|_| $variant_type::from_bip32_string(s).map(Self::[< $variant_name:snake >]))
                     )+