Update Account::find_identity() to return IdentityState.

iotaledger · Sep 29, 2021 · 1156f38 · 1156f38
1 parent b4a0deb
commit 1156f38
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/identity-account/src/account/account.rs b/identity-account/src/account/account.rs
@@ -111,10 +111,14 @@ impl Account {
     self.index.read().await.tags()
   }
 
-  /// Finds and returns the state snapshot for the identity specified by given `key`.
-  pub async fn find_identity<K: IdentityKey>(&self, key: K) -> Result<Option<IdentitySnapshot>> {
+  /// Finds and returns the identity state for the identity specified by given `key`.
+  pub async fn find_identity<K: IdentityKey>(&self, key: K) -> Result<Option<IdentityState>> {
     match self.resolve_id(&key).await {
-      Some(identity) => self.load_snapshot(identity).await.map(Some),
+      Some(identity) => self
+        .load_snapshot(identity)
+        .await
+        .map(IdentitySnapshot::into_identity)
+        .map(Some),
       None => Ok(None),
     }
   }

diff --git a/identity-account/src/tests/commands.rs b/identity-account/src/tests/commands.rs
@@ -186,8 +186,8 @@ async fn test_create_identity_from_private_key() -> Result<()> {
   let ident2 = account.find_identity(identity).await.unwrap().unwrap();
 
   // The same private key should result in the same did
-  assert_eq!(ident.identity().did(), ident2.identity().did());
-  assert_eq!(ident.identity().authentication()?, ident2.identity().authentication()?);
+  assert_eq!(ident.did(), ident2.did());
+  assert_eq!(ident.authentication()?, ident2.authentication()?);
 
   Ok(())
 }