fixes

multiversx · Aug 8, 2024 · 0d35385 · 0d35385
1 parent 73edf0b
commit 0d35385
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 19 deletions.
diff --git a/process/testdata/executingSCCall.json b/process/testdata/executingSCCall.json
@@ -161,6 +161,7 @@
             "operation": "ESDTNFTTransfer",
             "fee": "0",
             "callType": "directCall",
+            "status": "pending",
             "options": 0
         }
     ]

diff --git a/process/testdata/finishedOKRelayedTxIntraShard.json b/process/testdata/finishedOKRelayedTxIntraShard.json
@@ -53,7 +53,7 @@
       "receiver": "erd1kyaqzaprcdnv4luvanah0gfxzzsnpaygsy6pytrexll2urtd05ts9vegu7",
       "sender": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
       "timestamp": 1707396974,
-      "status": "success",
+      "status": "pending",
       "operation": "transfer",
       "fee": "0",
       "callType": "directCall",

diff --git a/process/testdata/finishedOKRelayedTxWithSCCall.json b/process/testdata/finishedOKRelayedTxWithSCCall.json
@@ -133,7 +133,7 @@
       "returnMessage": "gas refund for relayer",
       "sourceShard": 2,
       "destinationShard": 2,
-      "status": "success",
+      "status": "pending",
       "operation": "transfer",
       "fee": "0",
       "isRefund": true,

diff --git a/process/transactionProcessor.go b/process/transactionProcessor.go
@@ -512,14 +512,8 @@ func (tp *TransactionProcessor) computeTransactionStatus(tx *transaction.ApiTran
 		}
 	}
 
-	if checkIfCompleted(allLogs) {
-		return &data.ProcessStatusResponse{
-			Status: string(transaction.TxStatusSuccess),
-		}
-	}
-
 	return &data.ProcessStatusResponse{
-		Status: string(transaction.TxStatusPending),
+		Status: string(transaction.TxStatusSuccess),
 	}
 }
 

diff --git a/process/transactionProcessor_test.go b/process/transactionProcessor_test.go
@@ -1959,15 +1959,6 @@ func TestTransactionProcessor_computeTransactionStatus(t *testing.T) {
 			status := tp.ComputeTransactionStatus(testData.Transaction, withResults)
 			require.Equal(t, string(transaction.TxStatusSuccess), status.Status)
 		})
-		t.Run("tx ok but with nil logs", func(t *testing.T) {
-			t.Parallel()
-
-			testData := loadJsonIntoTxAndScrs(t, "./testdata/finishedOKSCCall.json")
-			tp := createTestProcessorFromScenarioData(testData)
-			testData.Transaction.Logs = nil
-			status := tp.ComputeTransactionStatus(testData.Transaction, withResults)
-			require.Equal(t, string(transaction.TxStatusPending), status.Status)
-		})
 		t.Run("tx failed", func(t *testing.T) {
 			t.Parallel()
 
@@ -2073,6 +2064,7 @@ func TestTransactionProcessor_computeTransactionStatus(t *testing.T) {
 			t.Parallel()
 
 			testData := loadJsonIntoTxAndScrs(t, "./testdata/finishedOKRelayedTxIntraShard.json")
+			testData.SCRs[0].Status = transaction.TxStatusSuccess
 			tp := createTestProcessorFromScenarioData(testData)
 
 			status := tp.ComputeTransactionStatus(testData.Transaction, withResults)
@@ -2112,6 +2104,7 @@ func TestTransactionProcessor_computeTransactionStatus(t *testing.T) {
 			t.Parallel()
 
 			testData := loadJsonIntoTxAndScrs(t, "./testdata/finishedOKRelayedTxWithSCCall.json")
+			testData.SCRs[1].Status = transaction.TxStatusSuccess
 			tp := createTestProcessorFromScenarioData(testData)
 
 			status := tp.ComputeTransactionStatus(testData.Transaction, withResults)
@@ -2175,7 +2168,7 @@ func TestTransactionProcessor_GetProcessedTransactionStatus(t *testing.T) {
 
 				txResponse := value.(*data.GetTransactionResponse)
 				txResponse.Data.Transaction.Nonce = 0
-				txResponse.Data.Transaction.Status = transaction.TxStatusSuccess
+				txResponse.Data.Transaction.Status = transaction.TxStatusPending
 
 				return http.StatusOK, nil
 			},