server/migration: Remove unnessary name parameter

Author: bilelmoussaoui

server/src/migration.rs

@@ -28,9 +28,9 @@ pub enum PendingMigration {
 
 impl PendingMigration {
     /// Attempt to migrate this keyring with the provided secret
-    pub async fn migrate(&self, name: &str, secret: &Secret) -> Result<UnlockedKeyring, Error> {
+    pub async fn migrate(&self, secret: &Secret) -> Result<UnlockedKeyring, Error> {
         match self {
-            Self::V0 { path, .. } => {
+            Self::V0 { path, name, .. } => {
                 tracing::debug!("Migrating v0 keyring: {}", name);
 
                 let unlocked = UnlockedKeyring::open(name, secret.clone()).await?;
@@ -50,7 +50,7 @@ impl PendingMigration {
                 Ok(unlocked)
             }
             #[cfg(feature = "kwallet_migration")]
-            Self::KWallet { path, .. } => {
+            Self::KWallet { path, name, .. } => {
                 tracing::debug!("Migrating KWallet keyring: {}", name);
 
                 // Parse KWallet file in blocking task

server/src/service/mod.rs

@@ -261,7 +261,7 @@ impl Service {
                             );
 
                             // Attempt migration with the provided secret (no locks held)
-                            match migration.migrate(migration_name, &secret).await {
+                            match migration.migrate(&secret).await {
                                 Ok(unlocked_keyring) => {
                                     tracing::info!(
                                         "Successfully migrated '{}' during unlock",
@@ -710,7 +710,7 @@ impl Service {
                     "Attempting immediate migration of KWallet keyring '{}'",
                     name
                 );
-                match migration.migrate(name, secret).await {
+                match migration.migrate(secret).await {
                     Ok(unlocked) => {
                         tracing::info!("Successfully migrated KWallet keyring '{}' to oo7", name);
                         discovered.push((
@@ -1291,7 +1291,7 @@ impl Service {
         for (name, migration) in pending.iter() {
             tracing::debug!("Attempting to migrate pending keyring: {}", name);
 
-            match migration.migrate(name, secret).await {
+            match migration.migrate(secret).await {
                 Ok(unlocked) => {
                     let label = migration.label();
                     let alias = migration.alias();