refactor: remove assetName (#619)

Co-authored-by: Mateusz Czeladka <mateusz.czeladka@cardanofoundation.org>

Author: matiwinnetou

api/src/main/java/org/cardanofoundation/rosetta/api/account/mapper/AccountMapperUtil.java

@@ -76,7 +76,8 @@ public List<Coin> mapUtxosToCoins(List<Utxo> utxos,
             Amt adaAsset = utxo.getAmounts().stream()
                     .filter(amt -> Constants.LOVELACE.equals(amt.getUnit()))
                     .findFirst()
-                    .orElseGet(() -> new Amt(null, null, Constants.ADA, BigInteger.ZERO));
+                    .orElseGet(() -> new Amt(null, Constants.ADA, BigInteger.ZERO));
+
             String coinIdentifier = "%s:%d".formatted(utxo.getTxHash(), utxo.getOutputIndex());
 
             return Coin.builder()

api/src/main/java/org/cardanofoundation/rosetta/api/account/model/domain/Amt.java

@@ -23,14 +23,18 @@ public class Amt implements Serializable {
   private String unit; // subject = policyId + hex(assetName)
   private String policyId;
 
-  // TODO avoid using assetName field for now
-  // TODO ASCI in case of CIP-26 and bech32 in case of CIP-68, actually it should always be ASCII and never bech32
-  @Deprecated
-  // consider removing
-  private String assetName;
-
   private BigInteger quantity;
 
+  /**
+   * Returns symbol as hex
+   *
+   * unit (subject) = policyId(hex) + symbol(hex)
+   */
+  @Nullable
+  public String getAssetNameAsHex() {
+    return getSymbolHex();
+  }
+
   /**
    * Returns symbol as hex
    *
@@ -45,10 +49,4 @@ public String getSymbolHex() {
     return unit.replace(policyId, "");
   }
 
-  @Deprecated
-  // TODO avoid using assetName field for now
-  public String getAssetName() {
-    return assetName;
-  }
-
 }

api/src/test/java/org/cardanofoundation/rosetta/api/account/mapper/AccountMapperUtilTest.java

@@ -512,7 +512,6 @@ private Amt createAmt(String policyId, String assetName, BigInteger quantity) {
     private Amt createAmt(String policyId, String assetName, BigInteger quantity, String unit) {
         return Amt.builder()
                 .policyId(policyId)
-                .assetName(assetName)
                 .quantity(quantity)
                 .unit(unit != null ? unit : (policyId != null ? policyId + assetName : assetName))
                 .build();

api/src/test/java/org/cardanofoundation/rosetta/api/account/service/AccountServiceImplTest.java

@@ -344,7 +344,7 @@ void getAccountCoinsWithCurrenciesPositiveTest() {
     when(utxo.getTxHash()).thenReturn("txHash");
     when(utxo.getOutputIndex()).thenReturn(1);
     when(utxo.getAmounts()).thenReturn(
-            Collections.singletonList(new Amt(LOVELACE, "", LOVELACE, BigInteger.valueOf(1000L))));
+            Collections.singletonList(new Amt(LOVELACE, null, BigInteger.valueOf(1000L))));
     when(accountCoinsRequest.getAccountIdentifier()).thenReturn(accountIdentifier);
     when(accountCoinsRequest.getCurrencies()).thenReturn(Collections.singletonList(currency));
     when(accountIdentifier.getAddress()).thenReturn(accountAddress);
@@ -369,7 +369,7 @@ void getAccountCoinsWithNullCurrenciesPositiveTest() {
     when(utxo.getTxHash()).thenReturn("txHash");
     when(utxo.getOutputIndex()).thenReturn(1);
     when(utxo.getAmounts()).thenReturn(
-            Collections.singletonList(new Amt(LOVELACE, "", LOVELACE, BigInteger.valueOf(1000L))));
+            Collections.singletonList(new Amt(LOVELACE, null, BigInteger.valueOf(1000L))));
     when(accountCoinsRequest.getAccountIdentifier()).thenReturn(accountIdentifier);
     when(accountCoinsRequest.getCurrencies()).thenReturn(null);
     when(accountIdentifier.getAddress()).thenReturn(accountAddress);

api/src/test/java/org/cardanofoundation/rosetta/api/block/mapper/BlockToBlockResponseTest.java

@@ -41,11 +41,11 @@ void mapToBlockResponse_test_invalidTransaction() {
         .blockNo(1L)
         .inputs(
             List.of(Utxo.builder().txHash("Hash").outputIndex(0).ownerAddr("Owner").amounts(List.of(
-                    Amt.builder().unit(unit).policyId(policyId).assetName("tAda").quantity(BigInteger.valueOf(10L)).build()))
+                    Amt.builder().unit(unit).policyId(policyId).quantity(BigInteger.valueOf(10L)).build()))
                 .build()))
         .outputs(
             List.of(Utxo.builder().txHash("Hash").outputIndex(0).ownerAddr("Owner").amounts(List.of(
-                    Amt.builder().unit(unit).policyId(policyId).assetName("tAda").quantity(BigInteger.valueOf(10L)).build()))
+                    Amt.builder().unit(unit).policyId(policyId).quantity(BigInteger.valueOf(10L)).build()))
                 .build()))
         .build();
 

api/src/test/java/org/cardanofoundation/rosetta/api/block/mapper/BlockTxToBlockTxResponseTest.java

@@ -72,7 +72,6 @@ private Utxo newUtxo() {
 
   private static Amt newAmt() {
     return Amt.builder()
-        .assetName("assetName1")
         .policyId("policyId1")
         .quantity(BigInteger.ONE)
         .unit("unit1")

api/src/test/java/org/cardanofoundation/rosetta/api/block/mapper/BlockTxToRosettaTransactionTest.java

@@ -425,7 +425,6 @@ private Utxo newUtxoOut() {
 
   private static Amt newAdaAmt() {
     return Amt.builder()
-        .assetName(Constants.LOVELACE)
         .quantity(BigInteger.TEN)
         .unit(Constants.LOVELACE)
         .build();
@@ -435,7 +434,6 @@ private static Amt newTokenAmt() {
     String policyId = "policyId1";
     String symbol = "assetName1";
     return Amt.builder()
-        .assetName("assetName1")
         .policyId(policyId)
         .quantity(BigInteger.ONE)
         .unit(policyId + symbol)

api/src/test/java/org/cardanofoundation/rosetta/api/block/mapper/TransactionMapperUtilsTest.java

@@ -243,7 +243,6 @@ void mapToOperationMetaDataSpentAmountTest() {
 
     List<Amt> amtList = Arrays.asList(
         Amt.builder()
-            .assetName(assetName)
             .policyId(policyId)
             .quantity(BigInteger.valueOf(1000))
             .unit(policyId + assetName)
@@ -299,7 +298,6 @@ private static Amt newAmt(int policy, int number, boolean isLovelace) {
     String unit = isLovelace ? Constants.LOVELACE : policyId + symbol;
 
     return Amt.builder()
-        .assetName(isLovelace ? Constants.LOVELACE : "assetName" + number)
         .policyId(policyId)
         .quantity(BigInteger.ONE)
         .unit(unit)
@@ -310,7 +308,6 @@ private static Amt newAmtWithCustomName(String policyId, String assetName, boole
     String unit = isLovelace ? Constants.LOVELACE : policyId + assetName;
 
     return Amt.builder()
-        .assetName(isLovelace ? Constants.LOVELACE : assetName)
         .policyId(policyId)
         .quantity(BigInteger.ONE)
         .unit(unit)

api/src/test/java/org/cardanofoundation/rosetta/api/common/service/TokenRegistryServiceImplTest.java

@@ -1112,11 +1112,10 @@ private Utxo createUtxoWithAmounts(List<Amt> amounts) {
         return Utxo.builder().amounts(amounts).build();
     }
 
-    private Amt createAmt(String assetName, String policyId, String unit) {
+    private Amt createAmt(String unit, String policyId, String lovelaceOrUnit) {
         return Amt.builder()
-            .assetName(assetName)
             .policyId(policyId)
-            .unit(unit)
+            .unit(lovelaceOrUnit)
             .quantity(BigDecimal.valueOf(1000000).toBigInteger())
             .build();
     }