chore: review fixes rollback to retain for asset filtering

Kalapaja · Nov 8, 2024 · 307fde6 · 307fde6
1 parent 2ef24e9
commit 307fde6
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/src/chain/tracker.rs b/src/chain/tracker.rs
@@ -253,28 +253,28 @@ impl ChainWatcher {
             &chain.asset
         );
         // Remove unwanted assets
-        assets = assets
-            .into_iter()
-            .filter_map(|(asset_name, properties)| {
-                tracing::info!(
-                    "chain {} has token {} with properties {:?}",
-                    &chain.name,
-                    &asset_name,
-                    &properties
-                );
+        assets.retain(|asset_name, properties| {
+            tracing::info!(
+                "chain {} has token {} with properties {:?}",
+                &chain.name,
+                asset_name,
+                properties
+            );
 
+            if let Some(ref native_token) = chain.native_token {
+                (native_token.name == *asset_name) && (native_token.decimals == specs.decimals)
+            } else {
                 chain
                     .asset
                     .iter()
-                    .find(|a| a.name == asset_name && Some(a.id) == properties.asset_id)
-                    .map(|a| (a.name.clone(), properties))
-            })
-            .collect();
+                    .any(|a| a.name == *asset_name && Some(a.id) == properties.asset_id)
+            }
+        });
 
-        if let Some(native_token) = chain.native_token.clone() {
+        if let Some(ref native_token) = chain.native_token {
             if native_token.decimals == specs.decimals {
                 assets.insert(
-                    native_token.name,
+                    native_token.name.clone(),
                     CurrencyProperties {
                         chain_name: name.clone(),
                         kind: TokenKind::Native,
@@ -356,3 +356,4 @@ impl ChainWatcher {
         Ok(chain)
     }
 }
+