RA-92: Changed output data from Double to Integer to maintain consist…

…ency
cardano-foundation · May 8, 2024 · 3e72391 · 3e72391
1 parent cf30a02
commit 3e72391
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/...g/cardanofoundation/rosetta/api/construction/service/impl/ConstructionApiServiceImpl.java b/...g/cardanofoundation/rosetta/api/construction/service/impl/ConstructionApiServiceImpl.java
@@ -77,7 +77,7 @@ public ConstructionPreprocessResponse constructionPreprocessService(
     NetworkIdentifier networkIdentifier = constructionPreprocessRequest.getNetworkIdentifier();
     Optional<ConstructionPreprocessMetadata> metadata = Optional.ofNullable(
         constructionPreprocessRequest.getMetadata());
-    Double relativeTtl;
+    int relativeTtl;
     DepositParameters depositParameters;
     if(metadata.isPresent()) {
       relativeTtl = cardanoService.checkOrReturnDefaultTtl(metadata.get().getRelativeTtl());
@@ -87,10 +87,10 @@ public ConstructionPreprocessResponse constructionPreprocessService(
       depositParameters = cardanoService.getDepositParameters();
     }
 
-    Double transactionSize = cardanoService.calculateTxSize(
+    int transactionSize = cardanoService.calculateTxSize(
         NetworkIdentifierType.findByName(networkIdentifier.getNetwork()),
         constructionPreprocessRequest.getOperations(), 0, depositParameters);
-    Map<String, Double> response = Map.of(Constants.RELATIVE_TTL, relativeTtl,
+    Map<String, Integer> response = Map.of(Constants.RELATIVE_TTL, relativeTtl,
         Constants.TRANSACTION_SIZE,
         transactionSize);
     return new ConstructionPreprocessResponse(response, null);
@@ -133,10 +133,10 @@ public ConstructionPayloadsResponse constructionPayloadsService(
     int ttl;
     DepositParameters depositParameters;
     if(metadata.isPresent()) {
-      ttl = cardanoService.checkOrReturnDefaultTtl(metadata.get().getTtl()).intValue();
+      ttl = cardanoService.checkOrReturnDefaultTtl(metadata.get().getTtl());
       depositParameters = Optional.ofNullable(metadata.get().getProtocolParameters()).map(protocolParameters -> new DepositParameters(protocolParameters.getKeyDeposit(), protocolParameters.getPoolDeposit())).orElse(cardanoService.getDepositParameters());
     } else {
-      ttl = Constants.DEFAULT_RELATIVE_TTL.intValue();
+      ttl = Constants.DEFAULT_RELATIVE_TTL;
       depositParameters = cardanoService.getDepositParameters();
     }
 

diff --git a/api/src/main/java/org/cardanofoundation/rosetta/common/services/CardanoService.java b/api/src/main/java/org/cardanofoundation/rosetta/common/services/CardanoService.java
@@ -35,14 +35,14 @@ public interface CardanoService {
   TransactionParsed parseTransaction(NetworkIdentifierType networkIdentifierType,
       String transaction, boolean signed);
 
-  Double checkOrReturnDefaultTtl(Integer relativeTtl);
+  Integer checkOrReturnDefaultTtl(Integer relativeTtl);
   Long updateTxSize(Long previousTxSize, Long previousTtl, Long updatedTtl);
   Long calculateTxMinimumFee(Long transactionSize, ProtocolParams protocolParameters);
 
   Signatures signatureProcessor(EraAddressType eraAddressType, AddressType addressType,
       String address);
 
-  Double calculateTxSize(NetworkIdentifierType networkIdentifierType, List<Operation> operations, int ttl, DepositParameters depositParameters);
+  Integer calculateTxSize(NetworkIdentifierType networkIdentifierType, List<Operation> operations, int ttl, DepositParameters depositParameters);
 
   String buildTransaction(String unsignedTransaction,
       List<Signatures> signaturesList, String transactionMetadata);

diff --git a/api/src/main/java/org/cardanofoundation/rosetta/common/services/impl/CardanoServiceImpl.java b/api/src/main/java/org/cardanofoundation/rosetta/common/services/impl/CardanoServiceImpl.java
@@ -113,8 +113,8 @@ public TransactionParsed parseTransaction(NetworkIdentifierType networkIdentifie
   }
 
   @Override
-  public Double checkOrReturnDefaultTtl(Integer relativeTtl) {
-    return relativeTtl == null ? Constants.DEFAULT_RELATIVE_TTL : relativeTtl.doubleValue();
+  public Integer checkOrReturnDefaultTtl(Integer relativeTtl) {
+    return relativeTtl == null ? Constants.DEFAULT_RELATIVE_TTL : relativeTtl;
   }
 
   @Override
@@ -195,7 +195,7 @@ public Signatures signatureProcessor(EraAddressType eraAddressType, AddressType
   }
 
   @Override
-  public Double calculateTxSize(NetworkIdentifierType networkIdentifierType,
+  public Integer calculateTxSize(NetworkIdentifierType networkIdentifierType,
       List<Operation> operations, int ttl, DepositParameters depositParameters) {
     UnsignedTransaction unsignedTransaction;
     try {
@@ -220,7 +220,7 @@ public Double calculateTxSize(NetworkIdentifierType networkIdentifierType,
 
     String transaction = buildTransaction(unsignedTransaction.bytes(), signaturesList,
         unsignedTransaction.metadata());
-    return ((double) transaction.length() / 2);
+    return (transaction.length() / 2);
 
   }
 

diff --git a/api/src/main/java/org/cardanofoundation/rosetta/common/util/Constants.java b/api/src/main/java/org/cardanofoundation/rosetta/common/util/Constants.java
@@ -54,7 +54,7 @@ private Constants() {
   public static final String MAINNET = "Mainnet";
   public static final String VALID_CURVE_TYPE = CurveType.EDWARDS25519.getValue();
   public static final int PUBLIC_KEY_BYTES_LENGTH = 64;
-  public static final Double DEFAULT_RELATIVE_TTL = 1000.0;
+  public static final Integer DEFAULT_RELATIVE_TTL = 1000;
 
   public static final String EMPTY_HEX = "\\x";
 

diff --git a/...est/java/org/cardanofoundation/rosetta/api/construction/preprocess/PreprocessApiTest.java b/...est/java/org/cardanofoundation/rosetta/api/construction/preprocess/PreprocessApiTest.java
@@ -39,7 +39,7 @@ public void simplePreprocessTest()
 
     ConstructionPreprocessResponse constructionPreprocessResponse = constructionApiService.constructionPreprocessService(
         preprocessRequest);
-    Map<String, Double> options = (Map<String, Double>)constructionPreprocessResponse.getOptions();
+    Map<String, Integer> options = (Map<String, Integer>)constructionPreprocessResponse.getOptions();
     assertEquals(1000, options.get("relative_ttl"));
     assertEquals(224, options.get("transaction_size"));
   }
@@ -52,7 +52,7 @@ public void twoWithdrawalsTest()
 
     ConstructionPreprocessResponse constructionPreprocessResponse = constructionApiService.constructionPreprocessService(
         preprocessRequest);
-    Map<String, Double> options = (Map<String, Double>)constructionPreprocessResponse.getOptions();
+    Map<String, Integer> options = (Map<String, Integer>)constructionPreprocessResponse.getOptions();
     assertEquals(100, options.get("relative_ttl"));
     assertEquals(399, options.get("transaction_size"));
   }
@@ -65,7 +65,7 @@ public void poolRegistrationTest()
 
     ConstructionPreprocessResponse constructionPreprocessResponse = constructionApiService.constructionPreprocessService(
         preprocessRequest);
-    Map<String, Double> options = (Map<String, Double>)constructionPreprocessResponse.getOptions();
+    Map<String, Integer> options = (Map<String, Integer>)constructionPreprocessResponse.getOptions();
     assertEquals(100, options.get("relative_ttl"));
     assertEquals(921, options.get("transaction_size"));
   }