From 6e2b109626e5415e6ee01b5c56010338a5ea5125 Mon Sep 17 00:00:00 2001
From: Dzmitry Hil <dzmitryhil@gmail.com>
Date: Thu, 7 Dec 2023 11:41:04 +0300
Subject: [PATCH] Fix tests

---
 .../coreum/contract_client_test.go            | 16 ++---
 integration-tests/processes/send_test.go      | 67 +++++--------------
 2 files changed, 23 insertions(+), 60 deletions(-)

diff --git a/integration-tests/coreum/contract_client_test.go b/integration-tests/coreum/contract_client_test.go
index 0760429b..65f95c7b 100644
--- a/integration-tests/coreum/contract_client_test.go
+++ b/integration-tests/coreum/contract_client_test.go
@@ -1722,10 +1722,10 @@ func TestSendFromCoreumToXRPLXRPLOriginatedToken(t *testing.T) {
 	operation := pendingOperations[0]
 	operationType := operation.OperationType.CoreumToXRPLTransfer
 	require.NotNil(t, operationType)
-	require.NotNil(t, operationType.Issuer, registeredXRPLOriginatedToken.Issuer)
-	require.NotNil(t, operationType.Currency, registeredXRPLOriginatedToken.Currency)
-	require.NotNil(t, operationType.Amount, amountToSend)
-	require.NotNil(t, operationType.Recipient, xrplRecipientAddress.String())
+	require.Equal(t, operationType.Issuer, registeredXRPLOriginatedToken.Issuer)
+	require.Equal(t, operationType.Currency, registeredXRPLOriginatedToken.Currency)
+	require.Equal(t, operationType.Amount, amountToSend)
+	require.Equal(t, operationType.Recipient, xrplRecipientAddress.String())
 
 	acceptedTxEvidence := coreum.XRPLTransactionResultCoreumToXRPLTransferEvidence{
 		XRPLTransactionResultEvidence: coreum.XRPLTransactionResultEvidence{
@@ -1983,10 +1983,10 @@ func TestSendFromCoreumToXRPLXRPToken(t *testing.T) {
 	operation := pendingOperations[0]
 	operationType := operation.OperationType.CoreumToXRPLTransfer
 	require.NotNil(t, operationType)
-	require.NotNil(t, operationType.Issuer, registeredXRPToken.Issuer)
-	require.NotNil(t, operationType.Currency, registeredXRPToken.Currency)
-	require.NotNil(t, operationType.Amount, amountToSend)
-	require.NotNil(t, operationType.Recipient, xrplRecipientAddress.String())
+	require.Equal(t, operationType.Issuer, registeredXRPToken.Issuer)
+	require.Equal(t, operationType.Currency, registeredXRPToken.Currency)
+	require.Equal(t, operationType.Amount, amountToSend)
+	require.Equal(t, operationType.Recipient, xrplRecipientAddress.String())
 
 	acceptedTxEvidence := coreum.XRPLTransactionResultCoreumToXRPLTransferEvidence{
 		XRPLTransactionResultEvidence: coreum.XRPLTransactionResultEvidence{
diff --git a/integration-tests/processes/send_test.go b/integration-tests/processes/send_test.go
index 76b9a9b5..35522674 100644
--- a/integration-tests/processes/send_test.go
+++ b/integration-tests/processes/send_test.go
@@ -126,58 +126,21 @@ func TestSendXRPTokenFromXRPLToCoreumAndBack(t *testing.T) {
 
 	xrplRecipientBalanceBefore := runnerEnv.Chains.XRPL.GetAccountBalance(ctx, t, xrplRecipientAddress, xrpl.XRPTokenIssuer, xrpl.XRPTokenCurrency)
 
-	_, err = runnerEnv.ContractClient.SendToXRPL(
-		ctx,
-		coreumSender,
-		xrplRecipientAddress.String(),
-		sdk.NewCoin(
-			registeredXRPToken.CoreumDenom,
-			integrationtests.ConvertStringWithDecimalsToSDKInt(
-				t,
-				"1.1",
-				xrpl.XRPCurrencyDecimals,
-			)),
-	)
-	require.NoError(t, err)
-	_, err = runnerEnv.ContractClient.SendToXRPL(
-		ctx,
-		coreumSender,
-		xrplRecipientAddress.String(),
-		sdk.NewCoin(
-			registeredXRPToken.CoreumDenom,
-			integrationtests.ConvertStringWithDecimalsToSDKInt(
-				t,
-				"0.5",
-				xrpl.XRPCurrencyDecimals,
-			)),
-	)
-	require.NoError(t, err)
-	_, err = runnerEnv.ContractClient.SendToXRPL(
-		ctx,
-		coreumSender,
-		xrplRecipientAddress.String(),
-		sdk.NewCoin(
-			registeredXRPToken.CoreumDenom,
-			integrationtests.ConvertStringWithDecimalsToSDKInt(
-				t,
-				"0.51111",
-				xrpl.XRPCurrencyDecimals,
-			)),
-	)
-	require.NoError(t, err)
-	_, err = runnerEnv.ContractClient.SendToXRPL(
-		ctx,
-		coreumSender,
-		xrplRecipientAddress.String(),
-		sdk.NewCoin(
-			registeredXRPToken.CoreumDenom,
-			integrationtests.ConvertStringWithDecimalsToSDKInt(
-				t,
-				"0.000001",
-				xrpl.XRPCurrencyDecimals,
-			)),
-	)
-	require.NoError(t, err)
+	for _, v := range []string{"1.1", "0.5", "0.51111", "0.000001"} {
+		_, err = runnerEnv.ContractClient.SendToXRPL(
+			ctx,
+			coreumSender,
+			xrplRecipientAddress.String(),
+			sdk.NewCoin(
+				registeredXRPToken.CoreumDenom,
+				integrationtests.ConvertStringWithDecimalsToSDKInt(
+					t,
+					v,
+					xrpl.XRPCurrencyDecimals,
+				)),
+		)
+		require.NoError(t, err)
+	}
 
 	runnerEnv.AwaitNoPendingOperations(ctx, t)