Fix Asset from_model bug to use passed in asset_id when initializing

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+### Fixed
+- Fix bug in `Asset.from_model` where passed in asset ID was not used when creating a gwei or wei asset.
+
 ## [0.10.3] - 2024-11-07
 
 ### Added

cdp/asset.py

@@ -52,7 +52,7 @@ def from_model(cls, model: AssetModel, asset_id: str | None = None) -> "Asset":
 
         return cls(
             network_id=model.network_id,
-            asset_id=model.asset_id,
+            asset_id=asset_id or model.asset_id,
             contract_address=model.contract_address,
             decimals=decimals,
         )

tests/test_asset.py

@@ -32,6 +32,7 @@ def test_asset_from_model_with_gwei(asset_model_factory):
     asset_model = asset_model_factory(asset_id="eth", decimals=18)
 
     asset = Asset.from_model(asset_model, asset_id="gwei")
+    assert asset.asset_id == "gwei"
     assert asset.decimals == 9
 
 
@@ -40,6 +41,7 @@ def test_asset_from_model_with_wei(asset_model_factory):
     asset_model = asset_model_factory(asset_id="eth", decimals=18)
 
     asset = Asset.from_model(asset_model, asset_id="wei")
+    assert asset.asset_id == "wei"
     assert asset.decimals == 0
 
 

tests/test_balance.py

@@ -42,7 +42,7 @@ def test_balance_from_model_with_asset_id(balance_model_factory):
     balance = Balance.from_model(balance_model, asset_id="gwei")
     assert balance.amount == Decimal("1000000000")
     assert isinstance(balance.asset, Asset)
-    assert balance.asset.asset_id == "eth"
+    assert balance.asset.asset_id == "gwei"
     assert balance.asset_id == "gwei"