8000 update StatusV2 to StatusWithBVP by JimAelf · Pull Request #3628 · AElfProject/AElf · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

update StatusV2 to StatusWithBVP #3628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 7, 2024
+7 −7
Merged

update StatusV2 to StatusWithBVP #3628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/AElf.WebApp.Application.Chain/Dto/TransactionResultDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down
8 changes: 4 additions & 4 deletions src/AElf.WebApp.Application.Chain/Services/TransactionResultAppService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,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;
output.StatusWithBVP = output.Status;

var transaction = await _transactionManager.GetTransactionAsync(transactionResult.TransactionId);
output.Transaction = _objectMapper.Map<Transaction, TransactionDto>(transaction);
Expand All @@ -154,7 +154,7 @@ public async Task<TransactionResultDto> 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;
}

Expand All @@ -167,7 +167,7 @@ public async Task<TransactionResultDto> 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;
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion test/AElf.WebApp.Application.Chain.Tests/BlockChainAppServiceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ public async Task Get_TransactionResultV2_Expired_Test()
// Check transaction status
var response = await GetResponseAsObjectAsync<TransactionResultDto>(
$"/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)
Expand Down
Loading
0