add conversion other way

stellar · Sep 25, 2024 · 6956f58 · 6956f58
1 parent d4376b6
commit 6956f58
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 1 deletion.
diff --git a/src/curr/account_conversions.rs b/src/curr/account_conversions.rs
@@ -13,3 +13,12 @@ impl From<PublicKey> for MuxedAccount {
         }
     }
 }
+
+impl MuxedAccount {
+    pub fn account_id(self) -> AccountId {
+        match self {
+            MuxedAccount::Ed25519(k) => AccountId(PublicKey::PublicKeyTypeEd25519(k)),
+            MuxedAccount::MuxedEd25519(m) => AccountId(PublicKey::PublicKeyTypeEd25519(m.ed25519)),
+        }
+    }
+}
diff --git a/src/next/account_conversions.rs b/src/next/account_conversions.rs
@@ -13,3 +13,12 @@ impl From<PublicKey> for MuxedAccount {
         }
     }
 }
+
+impl MuxedAccount {
+    pub fn account_id(self) -> AccountId {
+        match self {
+            MuxedAccount::Ed25519(k) => AccountId(PublicKey::PublicKeyTypeEd25519(k)),
+            MuxedAccount::MuxedEd25519(m) => AccountId(PublicKey::PublicKeyTypeEd25519(m.ed25519)),
+        }
+    }
+}
diff --git a/tests/account_conversions.rs b/tests/account_conversions.rs
@@ -4,7 +4,7 @@
 ))]
 #![cfg(feature = "std")]
 
-use ::stellar_xdr::curr::Uint256;
+use ::stellar_xdr::curr::{MuxedAccountMed25519, Uint256};
 #[cfg(feature = "curr")]
 use stellar_xdr::curr as stellar_xdr;
 #[cfg(feature = "next")]
@@ -25,3 +25,26 @@ fn from_public_key_to_muxed_account() {
     let muxed_account: MuxedAccount = public_key.into();
     assert_eq!(muxed_account, MuxedAccount::Ed25519(Uint256([1u8; 32])));
 }
+
+#[test]
+fn from_muxed_account_ed_to_account_id() {
+    let muxed_account: MuxedAccount = MuxedAccount::Ed25519(Uint256([1u8; 32]));
+    let account_id = muxed_account.account_id();
+    assert_eq!(
+        account_id,
+        AccountId(PublicKey::PublicKeyTypeEd25519(Uint256([1u8; 32])))
+    );
+}
+
+#[test]
+fn from_muxed_account_med_to_account_id() {
+    let muxed_account: MuxedAccount = MuxedAccount::MuxedEd25519(MuxedAccountMed25519 {
+        id: 2,
+        ed25519: Uint256([1u8; 32]),
+    });
+    let account_id = muxed_account.account_id();
+    assert_eq!(
+        account_id,
+        AccountId(PublicKey::PublicKeyTypeEd25519(Uint256([1u8; 32])))
+    );
+}