lfg2025/archy
1
0
Fork 0
Code Issues 16 Pull Requests 2 Actions Packages Projects Releases 44 Wiki Activity

fix: remove duplicate get_default_id, fix tests to use list()

Browse Source 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Dorian 2026-03-15 05:02:51 +00:00
parent eed4bc7211
commit de8dcee155
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/archipelago/src/identity_manager.rs
View File

@ -215,17 +215,6 @@ impl IdentityManager {
self.load_signing_key(id).await self.load_signing_key(id).await
} }
/// Get the default identity ID, if one is set.
pub async fn get_default_id(&self) -> Result<Option<String>> {
let marker = self.identities_dir.join(DEFAULT_MARKER);
if marker.exists() {
let id = fs::read_to_string(&marker).await?;
Ok(Some(id.trim().to_string()))
} else {
Ok(None)
}
}
/// Sign data with a specific identity. /// Sign data with a specific identity.
pub async fn sign(&self, id: &str, data: &[u8]) -> Result<String> { pub async fn sign(&self, id: &str, data: &[u8]) -> Result<String> {
let signing_key = self.load_signing_key(id).await?; let signing_key = self.load_signing_key(id).await?;
@ -501,9 +490,8 @@ mod tests {
let r1 = mgr.create("First".to_string(), IdentityPurpose::Personal).await.unwrap(); let r1 = mgr.create("First".to_string(), IdentityPurpose::Personal).await.unwrap();
let r2 = mgr.create("Second".to_string(), IdentityPurpose::Business).await.unwrap(); let r2 = mgr.create("Second".to_string(), IdentityPurpose::Business).await.unwrap();
mgr.set_default(&r2.id).await.unwrap(); mgr.set_default(&r2.id).await.unwrap();
let default_id = mgr.get_default_id().await.unwrap(); let (_, default_id) = mgr.list().await.unwrap();
assert_eq!(default_id, Some(r2.id.clone())); assert_eq!(default_id, Some(r2.id.clone()));
// First is no longer default
assert_ne!(default_id, Some(r1.id)); assert_ne!(default_id, Some(r1.id));
} }
@ -515,11 +503,7 @@ mod tests {
mgr.create("Second".to_string(), IdentityPurpose::Business).await.unwrap(); mgr.create("Second".to_string(), IdentityPurpose::Business).await.unwrap();
mgr.set_default(&r1.id).await.unwrap(); mgr.set_default(&r1.id).await.unwrap();
mgr.delete(&r1.id).await.unwrap(); mgr.delete(&r1.id).await.unwrap();
let (list, default_id) = mgr.list().await.unwrap(); let (list, _) = mgr.list().await.unwrap();
assert_eq!(list.len(), 1); assert_eq!(list.len(), 1);
// Default should have shifted or be cleared
if let Some(def) = default_id {
assert_ne!(def, r1.id, "Default should not point to deleted identity");
}
} }
} }