Refactor UniFFI remote enum declarations

Author: gemcoder21

apps/daemon/src/pusher/pusher.rs

@@ -3,7 +3,7 @@ use std::error::Error;
 use localizer::LanguageLocalizer;
 use number_formatter::{ValueFormatter, ValueStyle};
 use primitives::{
-    AddressFormatStyle, AddressFormatter, Asset, AssetVecExt, Chain, DeviceSubscription, FiatQuoteType, GorushNotification, NFTAssetId, PushNotification,
+    AddressFormatStyle, AddressFormatter, Asset, AssetVecExt, Chain, DeviceSubscription, FiatQuoteType, GorushNotification, PushNotification,
     PushNotificationTransaction, PushNotificationTypes, Transaction, TransactionNFTTransferMetadata, TransactionPerpetualMetadata, TransactionSwapMetadata, TransactionType,
 };
 use storage::{Database, ScanAddressesRepository};
@@ -67,7 +67,7 @@ impl Pusher {
             TransactionType::TransferNFT => {
                 let metadata = transaction.metadata.clone().ok_or("Missing metadata")?;
                 let metadata: TransactionNFTTransferMetadata = serde_json::from_value(metadata)?;
-                let nft_asset_id: NFTAssetId = metadata.asset_id.parse().map_err(|_| "Missing nft asset id")?;
+                let nft_asset_id = metadata.asset_id;
                 let name = if let Some(name) = metadata.name {
                     name
                 } else if nft_asset_id.token_id.len() < 6 {

crates/primitives/src/testkit/nft_mock.rs

@@ -4,6 +4,12 @@ use crate::{
     nft::{NFTAsset, NFTAssetId, NFTImages, NFTResource},
 };
 
+impl NFTAssetId {
+    pub fn mock() -> Self {
+        NFTAssetId::new(Chain::Ethereum, ETHEREUM_USDT_TOKEN_ID, "1")
+    }
+}
+
 impl NFTAsset {
     pub fn mock() -> Self {
         Self::mock_with_type(NFTType::ERC721)

crates/primitives/src/transaction_metadata_types.rs

@@ -30,21 +30,18 @@ pub struct TransactionSwapMetadata {
 #[typeshare(swift = "Sendable")]
 #[serde(rename_all = "camelCase")]
 pub struct TransactionNFTTransferMetadata {
-    pub asset_id: String,
+    pub asset_id: NFTAssetId,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub name: Option<String>,
 }
 
 impl TransactionNFTTransferMetadata {
-    pub fn new(asset_id: String, name: Option<String>) -> Self {
+    pub fn new(asset_id: NFTAssetId, name: Option<String>) -> Self {
         Self { asset_id, name }
     }
 
     pub fn from_asset_id(asset_id: NFTAssetId) -> Self {
-        Self {
-            asset_id: asset_id.to_string(),
-            name: None,
-        }
+        Self { asset_id, name: None }
     }
 }
 
@@ -74,18 +71,15 @@ mod tests {
 
     #[test]
     fn test_nft_transfer_metadata_serialization() {
+        let asset_id = NFTAssetId::mock();
+        let serialized = asset_id.to_string();
         assert_eq!(
-            serde_json::to_value(TransactionNFTTransferMetadata::new("ethereum_0xabc::1".to_string(), None)).unwrap(),
-            serde_json::json!({
-                "assetId": "ethereum_0xabc::1"
-            })
+            serde_json::to_value(TransactionNFTTransferMetadata::new(asset_id.clone(), None)).unwrap(),
+            serde_json::json!({ "assetId": serialized })
         );
         assert_eq!(
-            serde_json::to_value(TransactionNFTTransferMetadata::new("ethereum_0xabc::1".to_string(), Some("NFT".to_string()))).unwrap(),
-            serde_json::json!({
-                "assetId": "ethereum_0xabc::1",
-                "name": "NFT"
-            })
+            serde_json::to_value(TransactionNFTTransferMetadata::new(asset_id, Some("NFT".to_string()))).unwrap(),
+            serde_json::json!({ "assetId": serialized, "name": "NFT" })
         );
     }
 }