Address review comments

iotaledger · Aug 28, 2023 · 938cdda · 938cdda
1 parent b5fa32d
commit 938cdda
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/sdk/src/wallet/core/operations/stronghold_backup/stronghold_snapshot.rs b/sdk/src/wallet/core/operations/stronghold_backup/stronghold_snapshot.rs
@@ -12,7 +12,7 @@ use crate::{
         account::{AccountDetails, AccountDetailsDto},
         migration::{
             chrysalis::{key_to_chrysalis_key, migrate_from_chrysalis_data},
-            latest_backup_migration_version, migrate, MigrationVersion, MIGRATION_VERSION_KEY,
+            latest_backup_migration_version, migrate, MigrationData, MIGRATION_VERSION_KEY,
         },
         storage::constants::{CHRYSALIS_STORAGE_KEY, WALLET_INDEXATION_KEY},
         ClientOptions, Wallet,
@@ -200,11 +200,7 @@ async fn migrate_snapshot_from_chrysalis_to_stardust(
     }
 
     // set db migration version
-    let migration_version = MigrationVersion {
-        id: 4,
-        sdk_version: "1.0.0-rc.0".to_string(),
-        date: time::macros::date!(2023 - 07 - 19),
-    };
+    let migration_version = crate::wallet::migration::migrate_4::Migrate::version();
     stronghold_adapter
         .set(MIGRATION_VERSION_KEY, &migration_version)
         .await?;

diff --git a/sdk/src/wallet/migration/chrysalis.rs b/sdk/src/wallet/migration/chrysalis.rs
@@ -5,7 +5,7 @@ use std::{
     collections::{HashMap, HashSet},
     convert::TryInto,
     io::Read,
-    path::Path,
+    path::{Path, PathBuf},
     str::FromStr,
 };
 
@@ -22,7 +22,7 @@ use crate::{
     client::{constants::IOTA_COIN_TYPE, Password},
     types::block::address::Bech32Address,
     wallet::{
-        migration::{MigrationVersion, MIGRATION_VERSION_KEY},
+        migration::{MigrationData, MIGRATION_VERSION_KEY},
         storage::constants::{
             ACCOUNTS_INDEXATION_KEY, ACCOUNT_INDEXATION_KEY, CHRYSALIS_STORAGE_KEY, SECRET_MANAGER_KEY,
             WALLET_INDEXATION_KEY,
@@ -59,7 +59,7 @@ pub(crate) struct AccountDetailsDto {
 }
 
 pub async fn migrate_db_chrysalis_to_stardust(
-    storage_path: impl Into<String> + Send,
+    storage_path: impl Into<PathBuf> + Send,
     password: Option<Password>,
 ) -> Result<()> {
     let storage_path_string = storage_path.into();
@@ -118,11 +118,7 @@ pub async fn migrate_db_chrysalis_to_stardust(
     }
 
     // set db migration version
-    let migration_version = MigrationVersion {
-        id: 4,
-        sdk_version: "1.0.0-rc.0".to_string(),
-        date: time::macros::date!(2023 - 07 - 19),
-    };
+    let migration_version = crate::wallet::migration::migrate_4::Migrate::version();
     stardust_db.put(MIGRATION_VERSION_KEY, serde_json::to_string(&migration_version)?)?;
 
     drop(stardust_db);

diff --git a/sdk/src/wallet/migration/mod.rs b/sdk/src/wallet/migration/mod.rs
@@ -7,7 +7,7 @@ mod migrate_0;
 mod migrate_1;
 mod migrate_2;
 mod migrate_3;
-mod migrate_4;
+pub(crate) mod migrate_4;
 
 use std::collections::HashMap;