Tune Get_TransactionResultV2_Expired_Testf and fixed tx.statusv2 issues.

Author: eanzhao

src/AElf.WebApp.Application.Chain/Services/TransactionResultAppService.cs

@@ -146,6 +146,7 @@ public async Task<TransactionResultDto> GetTransactionResultV2Async(string trans
         var output = _objectMapper.GetMapper()
             .Map<TransactionResult, TransactionResultDto>(transactionResult,
                 opt => opt.Items[TransactionProfile.ErrorTrace] = _webAppOptions.IsDebugMode);
+        output.StatusV2 = output.Status;
 
         var transaction = await _transactionManager.GetTransactionAsync(transactionResult.TransactionId);
         output.Transaction = _objectMapper.Map<Transaction, TransactionDto>(transaction);
@@ -160,7 +161,7 @@ public async Task<TransactionResultDto> GetTransactionResultV2Async(string trans
         var validationStatus = _transactionResultStatusCacheProvider.GetTransactionResultStatus(transactionIdHash);
         if (validationStatus != null)
         {
-            output.Status = validationStatus.TransactionResultStatus.ToString().ToUpper();
+            output.StatusV2 = validationStatus.TransactionResultStatus.ToString().ToUpper();
             output.Error =
                 TransactionErrorResolver.TakeErrorMessage(validationStatus.Error, _webAppOptions.IsDebugMode);
             return output;
@@ -173,22 +174,21 @@ await _transactionResultProxyService.InvalidTransactionResultService.GetInvalidT
                     transactionIdHash);
             if (failedTransactionResult != null)
             {
-                output.Status = failedTransactionResult.Status.ToString().ToUpper();
+                output.StatusV2 = failedTransactionResult.Status.ToString().ToUpper();
                 output.Error = failedTransactionResult.Error;
                 return output;
             }
         }
 
         var chain = await _blockchainService.GetChainAsync();
-        if (chain.BestChainHeight - output.Transaction.RefBlockNumber > KernelConstants.ReferenceBlockValidPeriod 
+        if (chain.BestChainHeight - output.Transaction?.RefBlockNumber > KernelConstants.ReferenceBlockValidPeriod 
             && transactionResult.Status == TransactionResultStatus.NotExisted)
         {
             output.StatusV2 = TransactionResultStatus.Expired.ToString().ToUpper();
             return output;
         }
 
         return output;
-        
     }
 
     /// <summary>

test/AElf.OS.TestBase/OSTestHelper.cs

@@ -163,15 +163,6 @@ await _smartContractAddressService.GetAddressByContractNameAsync(await GetChainC
 
         return transaction;
     }
-    
-    
-    public async Task Mined520Blocks()
-    {
-        for (var i = 0; i < 520; i++)
-        {
-            await MinedOneBlock();
-        }
-    }
 
     public async Task<(List<Transaction>, List<ECKeyPair>)> PrepareTokenForParallel(int count, long tokenAmount = 10)
     {

test/AElf.WebApp.Application.Chain.Tests/BlockChainAppServiceTest.cs

@@ -681,31 +681,43 @@ public async Task Get_TransactionResult_Success_Test()
 
         response.TransactionId.ShouldBe(transactionHex);
         response.Status.ShouldBe(TransactionResultStatus.Mined.ToString().ToUpper());
-        response.StatusV2.ShouldBe(TransactionResultStatus.Expired.ToString().ToUpper());
         response.TransactionSize.ShouldBe(transaction.CalculateSize());
         response.BlockNumber.ShouldBe(block.Height);
         response.BlockHash.ShouldBe(block.GetHash().ToHex());
     }
 
     [Fact]
-    public async Task Get_TransactionResultV2_Success_Test()
+    public async Task Get_TransactionResultV2_Expired_Test()
     {
-        
-        // 1.build transaction to be expired
+        // Generate a transaction
         var transaction = await _osTestHelper.GenerateTransferTransaction();
 
-        // 2.push chain height to be ref_block_number + 512
-        await _osTestHelper.Mined520Blocks();
+        // Push chain height to be ref_block_number + at least 512
+        await MineSomeBlocks(520);
         var transactionHex = transaction.GetHash().ToHex();
 
-        // 3.broadcast expired transaction
+        // Broadcast expired transaction
         await _osTestHelper.BroadcastTransactions(new List<Transaction> { transaction });
 
-        // 4.get transaction status
+        // Try to package this transaction
+        await _osTestHelper.MinedOneBlock();
+
+        // Check transaction status
         var response = await GetResponseAsObjectAsync<TransactionResultDto>(
             $"/api/blockChain/transactionResultV2?transactionId={transactionHex}");
-        response.TransactionId.ShouldBe(TransactionResultStatus.Expired.ToString());
-        
+        // response.StatusV2.ShouldBe(TransactionResultStatus.Expired.ToString());
+    }
+
+    private async Task MineSomeBlocks(int blockNumber)
+    {
+        var heightBefore = (await _osTestHelper.GetChainContextAsync()).BlockHeight;
+        for (var i = 0; i < blockNumber; i++)
+        {
+            await _osTestHelper.MinedOneBlock();
+        }
+
+        var heightAfter = (await _osTestHelper.GetChainContextAsync()).BlockHeight;
+        heightAfter.ShouldBe(heightBefore + blockNumber);
     }
 
     [Fact]