From 2a62de270ea20d72e9d968c5b84ca2033c37901e Mon Sep 17 00:00:00 2001 From: "jim.dong" Date: Sat, 7 Dec 2024 15:27:00 +0800 Subject: [PATCH] update StatusV2 to StatusWithBVP --- .../Dto/TransactionResultDto.cs | 4 ++-- .../Services/TransactionResultAppService.cs | 8 ++++---- .../BlockChainAppServiceTest.cs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/AElf.WebApp.Application.Chain/Dto/TransactionResultDto.cs b/src/AElf.WebApp.Application.Chain/Dto/TransactionResultDto.cs index 115643789b..49459d3dc5 100644 --- a/src/AElf.WebApp.Application.Chain/Dto/TransactionResultDto.cs +++ b/src/AElf.WebApp.Application.Chain/Dto/TransactionResultDto.cs @@ -6,10 +6,10 @@ public class TransactionResultDto { public string TransactionId { get; set; } - [Obsolete("The Status is obsolete. Use StatusV2 instead.")] + [Obsolete("The Status is obsolete. Use StatusWithBVP instead.")] public string Status { get; set; } - public string StatusV2 { get; set; } + public string StatusWithBVP { get; set; } public LogEventDto[] Logs { get; set; } diff --git a/src/AElf.WebApp.Application.Chain/Services/TransactionResultAppService.cs b/src/AElf.WebApp.Application.Chain/Services/TransactionResultAppService.cs index 01d4272b64..1faccef3bb 100644 --- a/src/AElf.WebApp.Application.Chain/Services/TransactionResultAppService.cs +++ b/src/AElf.WebApp.Application.Chain/Services/TransactionResultAppService.cs @@ -144,7 +144,7 @@ public async Task GetTransactionResultV2Async(string trans var output = _objectMapper.GetMapper() .Map(transactionResult, opt => opt.Items[TransactionProfile.ErrorTrace] = _webAppOptions.IsDebugMode); - output.StatusV2 = output.Status; + output.StatusWithBVP = output.Status; var transaction = await _transactionManager.GetTransactionAsync(transactionResult.TransactionId); output.Transaction = _objectMapper.Map(transaction); @@ -154,7 +154,7 @@ public async Task GetTransactionResultV2Async(string trans if (transactionResult.Status == TransactionResultStatus.Pending && chain.BestChainHeight - output.Transaction?.RefBlockNumber > KernelConstants.ReferenceBlockValidPeriod) { - output.StatusV2 = TransactionResultStatus.Expired.ToString().ToUpper(); + output.StatusWithBVP = TransactionResultStatus.Expired.ToString().ToUpper(); return output; } @@ -167,7 +167,7 @@ public async Task GetTransactionResultV2Async(string trans var validationStatus = _transactionResultStatusCacheProvider.GetTransactionResultStatus(transactionIdHash); if (validationStatus != null) { - output.StatusV2 = validationStatus.TransactionResultStatus.ToString().ToUpper(); + output.StatusWithBVP = validationStatus.TransactionResultStatus.ToString().ToUpper(); output.Error = TransactionErrorResolver.TakeErrorMessage(validationStatus.Error, _webAppOptions.IsDebugMode); return output; @@ -180,7 +180,7 @@ await _transactionResultProxyService.InvalidTransactionResultService.GetInvalidT transactionIdHash); if (failedTransactionResult != null) { - output.StatusV2 = failedTransactionResult.Status.ToString().ToUpper(); + output.StatusWithBVP = failedTransactionResult.Status.ToString().ToUpper(); output.Error = failedTransactionResult.Error; return output; } diff --git a/test/AElf.WebApp.Application.Chain.Tests/BlockChainAppServiceTest.cs b/test/AElf.WebApp.Application.Chain.Tests/BlockChainAppServiceTest.cs index c4fc96777d..926798cbe1 100644 --- a/test/AElf.WebApp.Application.Chain.Tests/BlockChainAppServiceTest.cs +++ b/test/AElf.WebApp.Application.Chain.Tests/BlockChainAppServiceTest.cs @@ -702,7 +702,7 @@ public async Task Get_TransactionResultV2_Expired_Test() // Check transaction status var response = await GetResponseAsObjectAsync( $"/api/blockChain/transactionResultV2?transactionId={transactionHex}"); - response.StatusV2.ShouldBe(TransactionResultStatus.Expired.ToString().ToUpper()); + response.StatusWithBVP.ShouldBe(TransactionResultStatus.Expired.ToString().ToUpper()); } private async Task MineSomeBlocks(int blockNumber)