Skip to content

Commit 2a62de2

Browse files
committed
update StatusV2 to StatusWithBVP
1 parent a74faf0 commit 2a62de2

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/AElf.WebApp.Application.Chain/Dto/TransactionResultDto.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ public class TransactionResultDto
66
{
77
public string TransactionId { get; set; }
88

9-
[Obsolete("The Status is obsolete. Use StatusV2 instead.")]
9+
[Obsolete("The Status is obsolete. Use StatusWithBVP instead.")]
1010
public string Status { get; set; }
1111

12-
public string StatusV2 { get; set; }
12+
public string StatusWithBVP { get; set; }
1313

1414
public LogEventDto[] Logs { get; set; }
1515

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public async Task<TransactionResultDto> GetTransactionResultV2Async(string trans
144144
var output = _objectMapper.GetMapper()
145145
.Map<TransactionResult, TransactionResultDto>(transactionResult,
146146
opt => opt.Items[TransactionProfile.ErrorTrace] = _webAppOptions.IsDebugMode);
147-
output.StatusV2 = output.Status;
147+
output.StatusWithBVP = output.Status;
148148

149149
var transaction = await _transactionManager.GetTransactionAsync(transactionResult.TransactionId);
150150
output.Transaction = _objectMapper.Map<Transaction, TransactionDto>(transaction);
@@ -154,7 +154,7 @@ public async Task<TransactionResultDto> GetTransactionResultV2Async(string trans
154154
if (transactionResult.Status == TransactionResultStatus.Pending &&
155155
chain.BestChainHeight - output.Transaction?.RefBlockNumber > KernelConstants.ReferenceBlockValidPeriod)
156156
{
157-
output.StatusV2 = TransactionResultStatus.Expired.ToString().ToUpper();
157+
output.StatusWithBVP = TransactionResultStatus.Expired.ToString().ToUpper();
158158
return output;
159159
}
160160

@@ -167,7 +167,7 @@ public async Task<TransactionResultDto> GetTransactionResultV2Async(string trans
167167
var validationStatus = _transactionResultStatusCacheProvider.GetTransactionResultStatus(transactionIdHash);
168168
if (validationStatus != null)
169169
{
170-
output.StatusV2 = validationStatus.TransactionResultStatus.ToString().ToUpper();
170+
output.StatusWithBVP = validationStatus.TransactionResultStatus.ToString().ToUpper();
171171
output.Error =
172172
TransactionErrorResolver.TakeErrorMessage(validationStatus.Error, _webAppOptions.IsDebugMode);
173173
return output;
@@ -180,7 +180,7 @@ await _transactionResultProxyService.InvalidTransactionResultService.GetInvalidT
180180
transactionIdHash);
181181
if (failedTransactionResult != null)
182182
{
183-
output.StatusV2 = failedTransactionResult.Status.ToString().ToUpper();
183+
output.StatusWithBVP = failedTransactionResult.Status.ToString().ToUpper();
184184
output.Error = failedTransactionResult.Error;
185185
return output;
186186
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ public async Task Get_TransactionResultV2_Expired_Test()
702702
// Check transaction status
703703
var response = await GetResponseAsObjectAsync<TransactionResultDto>(
704704
$"/api/blockChain/transactionResultV2?transactionId={transactionHex}");
705-
response.StatusV2.ShouldBe(TransactionResultStatus.Expired.ToString().ToUpper());
705+
response.StatusWithBVP.ShouldBe(TransactionResultStatus.Expired.ToString().ToUpper());
706706
}
707707

708708
private async Task MineSomeBlocks(int blockNumber)

0 commit comments

Comments
 (0)