server/migration: Remove unnecessary name parameter

Author: bilelmoussaoui

server/src/migration.rs

@@ -31,11 +31,10 @@ impl PendingMigration {
     pub async fn migrate(
         &self,
         data_dir: &PathBuf,
-        name: &str,
         secret: &Secret,
     ) -> Result<UnlockedKeyring, Error> {
         match self {
-            Self::V0 { path, .. } => {
+            Self::V0 { path, name, .. } => {
                 tracing::debug!("Migrating v0 keyring: {}", name);
 
                 let unlocked = UnlockedKeyring::open_at(data_dir, name, secret.clone()).await?;
@@ -55,7 +54,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

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

server/src/tests.rs

@@ -5,10 +5,7 @@ use base64::Engine;
 use oo7::{Secret, crypto, dbus};
 use rustix::net::{AddressFamily, SocketFlags, SocketType, socketpair};
 use tokio_stream::StreamExt;
-use zbus::{
-    proxy::Defaults,
-    zvariant::{Fd, ObjectPath, Optional, Value},
-};
+use zbus::zvariant::{Fd, ObjectPath, Optional, Value};
 
 #[cfg(any(feature = "gnome_native_crypto", feature = "gnome_openssl_crypto"))]
 use crate::gnome::{