07193: Add in equivalence tests for HTS transfers

hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/MirrorNodeClient.java

@@ -217,7 +217,8 @@ public ContractResult getContractResultByTransactionId(String transactionId) {
 
     public ContractActionsResponse getContractActions(String transactionId) {
         log.debug("Verify contract actions '{}' is returned by Mirror Node", transactionId);
-        return callRestEndpoint("/contracts/results/{contractId}/actions", ContractActionsResponse.class, transactionId);
+        return callRestEndpoint(
+                "/contracts/results/{contractId}/actions", ContractActionsResponse.class, transactionId);
     }
 
     public NetworkExchangeRateSetResponse getExchangeRates() {

hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/NetworkAdapter.java

@@ -34,6 +34,8 @@
 import com.hedera.mirror.test.e2e.acceptance.util.ModelBuilder;
 import jakarta.inject.Named;
 import java.nio.ByteBuffer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tuweni.bytes.Bytes;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -120,19 +122,30 @@ public GeneralContractExecutionResponse contractsCall(
                     .estimate(isEstimate)
                     .value(amount != null ? amount.toTinybars() : 0);
 
-            var response = mirrorClient.contractsCall(contractCallRequestBody);
-            return new GeneralContractExecutionResponse(ContractCallResponseWrapper.of(response));
+            try {
+                var response = mirrorClient.contractsCall(contractCallRequestBody);
+                return new GeneralContractExecutionResponse(ContractCallResponseWrapper.of(response));
+            } catch (Exception e) {
+                return new GeneralContractExecutionResponse(e.getMessage());
+            }
         } else {
             final var gas = contractClient
                     .getSdkClient()
                     .getAcceptanceTestProperties()
                     .getFeatureProperties()
                     .getMaxContractFunctionGas();
 
-            final var result = contractClient.executeContract(deployedContract.contractId(), gas, method, data, amount);
-            final var txId = result.networkTransactionResponse().getTransactionIdStringNoCheckSum();
-            final var errorMessage = extractInternalCallErrorMessage(txId);
-            return new GeneralContractExecutionResponse(txId, result.networkTransactionResponse(), errorMessage);
+            try {
+                final var result =
+                        contractClient.executeContract(deployedContract.contractId(), gas, method, data, amount);
+                final var txId = result.networkTransactionResponse().getTransactionIdStringNoCheckSum();
+                final var errorMessage = extractInternalCallErrorMessage(txId);
+                return new GeneralContractExecutionResponse(txId, result.networkTransactionResponse(), errorMessage);
+            } catch (Exception e) {
+                final var txId = extractTransactionId(e.getMessage());
+                final var errorMessage = extractInternalCallErrorMessage(txId);
+                return new GeneralContractExecutionResponse(txId, errorMessage);
+            }
         }
     }
 
@@ -171,4 +184,14 @@ private String extractInternalCallErrorMessage(String transactionId) throws Ille
         var resultMessage = transactions.get(1).getResult();
         return resultMessage.equalsIgnoreCase("success") ? null : resultMessage;
     }
+
+    private static String extractTransactionId(String message) {
+        Pattern pattern = Pattern.compile("(\\d+\\.\\d+\\.\\d+)@(\\d+)\\.(\\d+)");
+        Matcher matcher = pattern.matcher(message);
+        if (matcher.find()) {
+            return matcher.group(1) + "-" + matcher.group(2) + "-" + matcher.group(3);
+        } else {
+            return "Not found";
+        }
+    }
 }

hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/TokenClient.java

@@ -643,6 +643,11 @@ public enum TokenNameEnum {
                 TokenType.NON_FUNGIBLE_UNIQUE,
                 TokenKycStatus.KycNotApplicable,
                 TokenFreezeStatus.FreezeNotApplicable),
+        NFTEQUIVALENCE(
+                "non_fungible",
+                TokenType.NON_FUNGIBLE_UNIQUE,
+                TokenKycStatus.KycNotApplicable,
+                TokenFreezeStatus.FreezeNotApplicable),
         FUNGIBLE_KYC_UNFROZEN(
                 "fungible_kyc_unfrozen", TokenType.FUNGIBLE_COMMON, TokenKycStatus.Granted, TokenFreezeStatus.Unfrozen),
         FUNGIBLE_KYC_UNFROZEN_2(

hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/response/GeneralContractExecutionResponse.java

@@ -37,6 +37,14 @@ public GeneralContractExecutionResponse(
         this(transactionId, networkResponse, errorMessage, null);
     }
 
+    public GeneralContractExecutionResponse(String errorMessage) {
+        this(null, null, errorMessage, null);
+    }
+
+    public GeneralContractExecutionResponse(String transactionId, String errorMessage) {
+        this(transactionId, null, errorMessage, null);
+    }
+
     public String getMirrorNodeResponseAsString() {
         return contractCallResponse.getResult().substring(2);
     }