fixup! WIP: needs refactoring

Holo-Host · Nov 7, 2024 · a9cba70 · a9cba70
1 parent 6adf5e3
commit a9cba70
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/core/src/config.rs b/core/src/config.rs
@@ -62,7 +62,7 @@ pub struct Settings {
 }
 
 /// Returns the default derivation path per config version.
-pub const fn default_derivation_path(config: ConfigDiscriminants) -> usize {
+pub const fn default_derivation_path(config: ConfigDiscriminants) -> u32 {
     match config {
         // TODO: what should these be?
         ConfigDiscriminants::V1 => 3,

diff --git a/core/src/utils.rs b/core/src/utils.rs
@@ -3,7 +3,7 @@ use failure::{bail, ResultExt};
 use log::debug;
 
 use crate::{
-    config::Seed,
+    config::{self, ConfigDiscriminants, Seed},
     types::{SeedExplorerError, SeedExplorerResult},
 };
 use hc_seed_bundle::{LockedSeedCipher, UnlockedSeedBundle};
@@ -47,7 +47,9 @@ pub async fn generate_device_bundle(
         .await
         .unwrap();
 
-    let derivation_path = maybe_derivation_path.unwrap_or(DEFAULT_DERIVATION_PATH_V3);
+    let derivation_path = maybe_derivation_path.unwrap_or(config::default_derivation_path(
+        ConfigDiscriminants::default(),
+    ));
 
     let device_bundle = master.derive(derivation_path).await.unwrap();
 

diff --git a/gen-cli/src/main.rs b/gen-cli/src/main.rs
@@ -75,7 +75,7 @@ async fn main() -> Result<(), Error> {
     let derivation_path = if let Some(derivation_path) = args.derivation_path {
         derivation_path
     } else {
-        hpos_config_core::utils::DEFAULT_DERIVATION_PATH_V2
+        hpos_config_core::config::default_derivation_path(ConfigDiscriminants::default())
     };
 
     // TODO: don't hardcode this