feat: RA-44 Integration tests for /blocks and /block/transactions (#123)

* feat: RA-44 add em to int test

* feat: RA-44 rm TODOs

* feat: RA-44 fix windows local start for h2

* feat: RA-44 add assert for sender2

Author: shleger

.env.h2

@@ -1,5 +1,5 @@
 LOG=INFO
-NETWORK="devkit"  # devkit, mainnet, testnet, prepro
+NETWORK=devkit  # devkit, mainnet, testnet, prepro
 PROTOCOL_MAGIC=42
 
 #common env
@@ -9,18 +9,18 @@ DB_ADMIN_USER_SECRET=weakpwd#123_d
 DB_IMAGE_NAME=h2
 DB_IMAGE_TAG=14.11-bullseye
 DB_NAME=rosetta-java-preprod
-DB_HOST="db" # Service name in docker-compose or local db
+DB_HOST=db # Service name in docker-compose or local db
 DB_PORT=5432
 DB_SCHEMA=${NETWORK}
 MAXIMUM_POOL_SIZE=80
 JDBC_BATCH_SIZE=1000
 SCHEMA=${NETWORK}
-CARDANO_NODE_HOST="localhost" # Service name in docker-compose or local cardano node
+CARDANO_NODE_HOST=localhost # Service name in docker-compose or local cardano node
 CARDANO_NODE_PORT=3001 # Uncomment if you are using local cardano node
 CARDANO_NODE_VERSION=8.9.0
-CARDANO_NODE_SUBMIT_HOST="cardano-submit-api"
+CARDANO_NODE_SUBMIT_HOST=cardano-submit-api
 NODE_SUBMIT_API_PORT=8090
-CARDANO_NODE_SOCKET="./node-ipc"
+CARDANO_NODE_SOCKET=./node-ipc
 
 #api env
 API_SPRING_PROFILES_ACTIVE=h2

api/src/main/java/org/cardanofoundation/rosetta/api/block/mapper/BlockTxToRosettaTransaction.java

@@ -33,7 +33,7 @@ public class BlockTxToRosettaTransaction {
   final WithdrawalToOperation withdrawalToOperation;
 
   private static final OperationStatus status = OperationStatus.builder()
-      .status(SUCCESS_OPERATION_STATUS.getStatus()) // TODO saa: need to check the right status
+      .status(SUCCESS_OPERATION_STATUS.getStatus())
       .build();
 
 

api/src/main/java/org/cardanofoundation/rosetta/api/block/mapper/WithdrawalToOperation.java

@@ -2,16 +2,18 @@
 
 import java.math.BigInteger;
 import java.util.Optional;
+
 import lombok.AllArgsConstructor;
-import org.cardanofoundation.rosetta.api.block.model.domain.Withdrawal;
-import org.cardanofoundation.rosetta.common.annotation.OpenApiMapper;
-import org.cardanofoundation.rosetta.common.enumeration.OperationType;
+
 import org.modelmapper.ModelMapper;
-import org.modelmapper.spi.MappingContext;
 import org.openapitools.client.model.Amount;
 import org.openapitools.client.model.Operation;
 import org.openapitools.client.model.OperationStatus;
 
+import org.cardanofoundation.rosetta.api.block.model.domain.Withdrawal;
+import org.cardanofoundation.rosetta.common.annotation.OpenApiMapper;
+import org.cardanofoundation.rosetta.common.enumeration.OperationType;
+
 @OpenApiMapper
 @AllArgsConstructor
 public class WithdrawalToOperation extends AbstractToOperation<Withdrawal>{
@@ -30,7 +32,7 @@ public Operation toDto(Withdrawal model, OperationStatus status, int index) {
           mp.<Amount>map(f -> updateDepositAmount(
               Optional.ofNullable(model.getAmount())
                   .map(BigInteger::negate)
-                  .orElse(BigInteger.ZERO)), //TODO saa: is it OK?
+                  .orElse(BigInteger.ZERO)),
               (d, v) -> d.getMetadata().setWithdrawalAmount(v));
           mp.<Long>map(f -> index, (d, v) -> d.getOperationIdentifier().setIndex(v));
         })

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

@@ -169,7 +169,6 @@ void toDto_test_Ok() {
             .map(Operation::getMetadata)
             .collect(Collectors.toList()))
         .allSatisfy(d -> {
-          //TODO saa: Is it OK to have all values here is null other than depositAmount?
           assertAllPropertiesIsNull(d, "depositAmount");
           assertProperty(d, "depositAmount",
               Amount

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

@@ -41,7 +41,6 @@ void toDto() {
     assertThat(tx.getMetadata().getScriptSize()).isEqualTo(from.getScriptSize());
     assertThat(tx.getTransactionIdentifier().getHash()).isEqualTo(from.getHash());
 
-    //TODO saa: there are no related transactions for org.openapitools.client.model.Transaction.setRelatedTransactions
     assertThat(tx.getRelatedTransactions()).isNull();
   }
 

api/src/test/java/org/cardanofoundation/rosetta/api/block/service/BlockServiceImplIntTest.java

@@ -1,5 +1,9 @@
 package org.cardanofoundation.rosetta.api.block.service;
 
+import java.math.BigInteger;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.junit.jupiter.api.Test;
@@ -8,20 +12,27 @@
 import org.cardanofoundation.rosetta.api.account.model.domain.Utxo;
 import org.cardanofoundation.rosetta.api.block.model.domain.Block;
 import org.cardanofoundation.rosetta.api.block.model.domain.BlockTx;
+import org.cardanofoundation.rosetta.api.block.model.entity.BlockEntity;
+import org.cardanofoundation.rosetta.api.block.model.entity.UtxoKey;
 import org.cardanofoundation.rosetta.common.services.ProtocolParamService;
-import org.cardanofoundation.rosetta.testgenerator.common.TestConstants;
-import org.cardanofoundation.rosetta.testgenerator.common.TestTransactionNames;
 import org.cardanofoundation.rosetta.testgenerator.common.TransactionBlockDetails;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.cardanofoundation.rosetta.testgenerator.common.TestConstants.ACCOUNT_BALANCE_LOVELACE_AMOUNT;
+import static org.cardanofoundation.rosetta.testgenerator.common.TestConstants.SENDER_2_ADDRESS;
+import static org.cardanofoundation.rosetta.testgenerator.common.TestConstants.TEST_ACCOUNT_ADDRESS;
+import static org.cardanofoundation.rosetta.testgenerator.common.TestTransactionNames.SIMPLE_TRANSACTION;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 class BlockServiceImplIntTest extends IntegrationTest {
 
   @Autowired
   private BlockService blockService;
-  final TransactionBlockDetails simpleTx = generatedDataMap.get(
-      TestTransactionNames.SIMPLE_TRANSACTION.getName());
+  final TransactionBlockDetails simpleTx = generatedDataMap.get(SIMPLE_TRANSACTION.getName());
+
+  @PersistenceContext
+  private EntityManager entityManager;
 
 
   @Autowired
@@ -31,18 +42,17 @@ class BlockServiceImplIntTest extends IntegrationTest {
   void getBlockWithTransaction_Test() {
     //given
     //when
-    Block block = blockService.findBlock(simpleTx.blockNumber(),
-        simpleTx.blockHash());
+    Block block = blockService.findBlock(simpleTx.blockNumber(), simpleTx.blockHash());
 
     //then
     assertEquals(simpleTx.blockHash(), block.getHash());
     assertEquals(simpleTx.blockNumber(), block.getSlotNo());
     assertEquals(1, block.getTransactions().size());
 
     Utxo receiverUtxoDto = block.getTransactions().getFirst().getOutputs().getFirst();
-    assertEquals(TestConstants.TEST_ACCOUNT_ADDRESS, receiverUtxoDto.getOwnerAddr());
+    assertEquals(TEST_ACCOUNT_ADDRESS, receiverUtxoDto.getOwnerAddr());
     assertEquals(simpleTx.txHash(), receiverUtxoDto.getTxHash());
-    assertEquals(TestConstants.ACCOUNT_BALANCE_LOVELACE_AMOUNT,
+    assertEquals(ACCOUNT_BALANCE_LOVELACE_AMOUNT,
         receiverUtxoDto.getLovelaceAmount().toString());
 
   }
@@ -70,17 +80,36 @@ void getBlockTransaction_Test() {
     assertEquals(0, tx.getPoolRetirements().size());
     assertEquals(0, tx.getDelegations().size());
 
+    assertNotNull(entityManager);
+    BlockEntity fromBlockB = entityManager
+        .createQuery("from BlockEntity b where b.number=:block", BlockEntity.class)
+        .setParameter("block", simpleTx.blockNumber())
+        .getSingleResult();
+
     Utxo inUtxo = tx.getInputs().getFirst();
+    UtxoKey expectedInputKey = fromBlockB.getTransactions().getFirst().getInputKeys().getFirst();
+
+    assertEquals(SENDER_2_ADDRESS, inUtxo.getOwnerAddr());
+    assertEquals(expectedInputKey.getTxHash(), inUtxo.getTxHash());
+    assertEquals(expectedInputKey.getOutputIndex(), inUtxo.getOutputIndex());
+
+    Utxo outUtxo1 = tx.getOutputs().getFirst();
+    assertEquals(TEST_ACCOUNT_ADDRESS, outUtxo1.getOwnerAddr());
+    assertEquals(blockTxHash, outUtxo1.getTxHash());
+    assertEquals(ACCOUNT_BALANCE_LOVELACE_AMOUNT, outUtxo1.getLovelaceAmount().toString());
+
+    Utxo outUtxo2 = tx.getOutputs().getLast();
+    assertEquals(SENDER_2_ADDRESS, outUtxo2.getOwnerAddr());
+    assertEquals(blockTxHash, outUtxo2.getTxHash());
 
-    //TODO saa: how to check?
-    assertEquals(TestConstants.SENDER_2_ADDRESS, inUtxo.getOwnerAddr());
-//    assertEquals(blockTxHash, inUtxo.getTxHash());
+    //  init deposit was 1000 ADA for the account1: addr_test1qp73lju...
+    //  (@see test-data-generator/README.md)
+    BigInteger initAmountSender1 = BigInteger.valueOf(1000 * 1_000_000); //ADA to lovelace
+    BigInteger expected = initAmountSender1
+        .add(fromBlockB.getTotalFees().negate()) //fee
+        .add(new BigInteger(ACCOUNT_BALANCE_LOVELACE_AMOUNT).negate()); //sent amount
 
-    Utxo outUtxo = tx.getOutputs().getFirst();
-    assertEquals(TestConstants.TEST_ACCOUNT_ADDRESS, outUtxo.getOwnerAddr());
-    assertEquals(blockTxHash, outUtxo.getTxHash());
-    assertEquals(TestConstants.ACCOUNT_BALANCE_LOVELACE_AMOUNT,
-        outUtxo.getLovelaceAmount().toString());
+    assertEquals(expected, outUtxo2.getLovelaceAmount());
 
   }