fix relayer tests

CoreumFoundation · Nov 29, 2023 · df902e8 · df902e8
1 parent 9aa413b
commit df902e8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 28 deletions.
diff --git a/relayer/processes/xrpl_tx_observer_test.go b/relayer/processes/xrpl_tx_observer_test.go
@@ -145,20 +145,14 @@ func TestXRPLTxObserver_Start(t *testing.T) {
 				contractClientMock := NewMockContractClient(ctrl)
 				stringCurrency := xrpl.ConvertCurrencyToString(xrplOriginatedTokenXRPLAmount.Currency)
 
-				tokenDecimals := uint32(10)
-				contractClientMock.EXPECT().GetCoreumTokenByXRPLCurrency(gomock.Any(), stringCurrency).
-					Return(coreum.CoreumToken{
-						Decimals: tokenDecimals,
-					}, nil)
-
 				contractClientMock.EXPECT().SendXRPLToCoreumTransferEvidence(
 					gomock.Any(),
 					relayerAddress,
 					coreum.XRPLToCoreumTransferEvidence{
 						TxHash:    rippledata.Hash256{}.String(),
 						Issuer:    bridgeXRPLAddress.String(),
 						Currency:  stringCurrency,
-						Amount:    sdkmath.NewIntWithDecimal(999, int(tokenDecimals)),
+						Amount:    sdkmath.NewIntWithDecimal(999, int(15)),
 						Recipient: coreumRecipientAddress,
 					},
 				).Return(nil, nil)

diff --git a/relayer/processes/xrpl_tx_submitter_operation_tx.go b/relayer/processes/xrpl_tx_submitter_operation_tx.go
@@ -90,12 +90,10 @@ func BuildCoreumToXRPLXRPLOriginatedTokenTransferPaymentTxForMultiSigning(bridge
 func BuildCoreumToXRPLCoreumOriginatedTokenTransferPaymentTxForMultiSigning(
 	bridgeXRPLAddress rippledata.Account,
 	operation coreum.Operation,
-	decimals uint32,
 ) (*rippledata.Payment, error) {
 	coreumToXRPLTransferOperationType := operation.OperationType.CoreumToXRPLTransfer
-	value, err := ConvertCoreumOriginatedTokenCoreumAmountToXRPLAmount(
+	value, err := ConvertXRPLOriginatedTokenCoreumAmountToXRPLAmount(
 		coreumToXRPLTransferOperationType.Amount,
-		decimals,
 		coreumToXRPLTransferOperationType.Issuer,
 		coreumToXRPLTransferOperationType.Currency,
 	)

diff --git a/relayer/processes/xrpl_tx_submitter_test.go b/relayer/processes/xrpl_tx_submitter_test.go
@@ -47,10 +47,9 @@ func TestXRPLTxSubmitter_Start(t *testing.T) {
 		coreumToXRPLXRPLOriginatedTokenTransferOperationValidSigners := buildCoreumToXRPLXRPLOriginatedTokenTransferTestData(t, xrplTxSigners, bridgeXRPLAddress, contractRelayers)
 
 	// CoreumOriginated
-	coreumOriginatedTokenDecimals := uint32(6)
 	coreumToXRPLCoreumOriginatedTokenTransferOperation,
 		coreumToXRPLCoreumOriginatedTokenTransferOperationWithSignatures,
-		coreumToXRPLCoreumOriginatedTokenTransferOperationValidSigners := buildCoreumToXRPLCoreumOriginatedTokenTransferTestData(t, xrplTxSigners, bridgeXRPLAddress, contractRelayers, coreumOriginatedTokenDecimals)
+		coreumToXRPLCoreumOriginatedTokenTransferOperationValidSigners := buildCoreumToXRPLCoreumOriginatedTokenTransferTestData(t, xrplTxSigners, bridgeXRPLAddress, contractRelayers)
 
 	tests := []struct {
 		name                  string
@@ -257,10 +256,6 @@ func TestXRPLTxSubmitter_Start(t *testing.T) {
 				contractClientMock.EXPECT().GetContractConfig(gomock.Any()).Return(coreum.ContractConfig{
 					Relayers: contractRelayers,
 				}, nil)
-				contractClientMock.EXPECT().GetCoreumTokenByXRPLCurrency(gomock.Any(), coreumToXRPLCoreumOriginatedTokenTransferOperation.OperationType.CoreumToXRPLTransfer.Currency).
-					Return(coreum.CoreumToken{
-						Decimals: coreumOriginatedTokenDecimals,
-					}, nil)
 				contractClientMock.EXPECT().SaveSignature(gomock.Any(), contractRelayers[0].CoreumAddress, coreumToXRPLCoreumOriginatedTokenTransferOperation.TicketSequence, coreumToXRPLCoreumOriginatedTokenTransferOperationValidSigners[0].Signer.TxnSignature.String())
 				return contractClientMock
 			},
@@ -271,7 +266,7 @@ func TestXRPLTxSubmitter_Start(t *testing.T) {
 			},
 			xrplTxSignerBuilder: func(ctrl *gomock.Controller) processes.XRPLTxSigner {
 				xrplTxSignerMock := NewMockXRPLTxSigner(ctrl)
-				tx, err := processes.BuildCoreumToXRPLCoreumOriginatedTokenTransferPaymentTxForMultiSigning(bridgeXRPLAddress, coreumToXRPLCoreumOriginatedTokenTransferOperation, coreumOriginatedTokenDecimals)
+				tx, err := processes.BuildCoreumToXRPLCoreumOriginatedTokenTransferPaymentTxForMultiSigning(bridgeXRPLAddress, coreumToXRPLCoreumOriginatedTokenTransferOperation)
 				require.NoError(t, err)
 				xrplTxSignerMock.EXPECT().MultiSign(tx, xrplTxSignerKeyName).Return(coreumToXRPLCoreumOriginatedTokenTransferOperationValidSigners[0], nil)
 
@@ -286,16 +281,12 @@ func TestXRPLTxSubmitter_Start(t *testing.T) {
 				contractClientMock.EXPECT().GetContractConfig(gomock.Any()).Return(coreum.ContractConfig{
 					Relayers: contractRelayers,
 				}, nil)
-				contractClientMock.EXPECT().GetCoreumTokenByXRPLCurrency(gomock.Any(), coreumToXRPLCoreumOriginatedTokenTransferOperationWithSignatures.OperationType.CoreumToXRPLTransfer.Currency).
-					Return(coreum.CoreumToken{
-						Decimals: coreumOriginatedTokenDecimals,
-					}, nil).Times(3)
 				return contractClientMock
 			},
 			xrplRPCClientBuilder: func(ctrl *gomock.Controller) processes.XRPLRPCClient {
 				xrplRPCClientMock := NewMockXRPLRPCClient(ctrl)
 				xrplRPCClientMock.EXPECT().AccountInfo(gomock.Any(), bridgeXRPLAddress).Return(bridgeXRPLSignerAccountWithSigners, nil)
-				expectedTx, err := processes.BuildCoreumToXRPLCoreumOriginatedTokenTransferPaymentTxForMultiSigning(bridgeXRPLAddress, coreumToXRPLCoreumOriginatedTokenTransferOperationWithSignatures, coreumOriginatedTokenDecimals)
+				expectedTx, err := processes.BuildCoreumToXRPLCoreumOriginatedTokenTransferPaymentTxForMultiSigning(bridgeXRPLAddress, coreumToXRPLCoreumOriginatedTokenTransferOperationWithSignatures)
 				require.NoError(t, err)
 				require.NoError(t, rippledata.SetSigners(expectedTx, coreumToXRPLCoreumOriginatedTokenTransferOperationValidSigners...))
 				xrplRPCClientMock.EXPECT().Submit(gomock.Any(), gomock.Any()).Do(func(ctx context.Context, tx rippledata.Transaction) (xrpl.SubmitResult, error) {
@@ -502,7 +493,6 @@ func buildCoreumToXRPLCoreumOriginatedTokenTransferTestData(
 	xrplTxSigners []*xrpl.PrivKeyTxSigner,
 	bridgeXRPLAddress rippledata.Account,
 	contractRelayers []coreum.Relayer,
-	decimals uint32,
 ) (
 	coreum.Operation, coreum.Operation, []rippledata.Signer,
 ) {
@@ -526,9 +516,7 @@ func buildCoreumToXRPLCoreumOriginatedTokenTransferTestData(
 		xrplTxSigners,
 		contractRelayers,
 		bridgeXRPLAddress,
-		func(t *testing.T, signer *xrpl.PrivKeyTxSigner, account rippledata.Account, operation coreum.Operation) rippledata.Signer {
-			return multiSignCoreumToXRPLCoreumOriginatedTokeTransferOperation(t, signer, account, operation, decimals)
-		},
+		multiSignCoreumToXRPLCoreumOriginatedTokeTransferOperation,
 	)
 
 	return operation, operationWithSignatures, validSigners
@@ -616,9 +604,8 @@ func multiSignCoreumToXRPLCoreumOriginatedTokeTransferOperation(
 	relayerXRPLSigner *xrpl.PrivKeyTxSigner,
 	bridgeXRPLAcc rippledata.Account,
 	operation coreum.Operation,
-	decimals uint32,
 ) rippledata.Signer {
-	tx, err := processes.BuildCoreumToXRPLCoreumOriginatedTokenTransferPaymentTxForMultiSigning(bridgeXRPLAcc, operation, decimals)
+	tx, err := processes.BuildCoreumToXRPLCoreumOriginatedTokenTransferPaymentTxForMultiSigning(bridgeXRPLAcc, operation)
 	require.NoError(t, err)
 	signer, err := relayerXRPLSigner.MultiSign(tx)
 	require.NoError(t, err)