Skip to content
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.

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

remove retry from withdrawals #396

Merged
merged 1 commit into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions src/Jobs/PerformWithdrawalJob.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,8 @@ public async Task Execute(IJobExecutionContext context)
}

_logger.LogError(e, "Error on {JobName}", nameof(PerformWithdrawalJob));
throw new JobExecutionException(e, false);
}

_logger.LogInformation("{JobName} ended", nameof(PerformWithdrawalJob));
}
}
}
3 changes: 1 addition & 2 deletions src/Pages/Wallets.razor
Original file line number Diff line number Diff line change
Expand Up @@ -1489,8 +1489,7 @@
var map = new JobDataMap();
map.Put("withdrawalRequestId", withdrawalRequest.Id);

var retryList = RetriableJob.ParseRetryListFromString(Constants.JOB_RETRY_INTERVAL_LIST_IN_MINUTES);
var job = RetriableJob.Create<PerformWithdrawalJob>(map, withdrawalRequest.Id.ToString(), retryList);
var job = SimpleJob.Create<PerformWithdrawalJob>(map, withdrawalRequest.Id.ToString());
await scheduler.ScheduleJob(job.Job, job.Trigger);

if (withdrawalRequest != null)
Expand Down
5 changes: 2 additions & 3 deletions src/Pages/Withdrawals.razor
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@
TemplatePsbtString="@_templatePsbtString"
ApproveRequestDelegate="async () => await ApproveRequestDelegate()"/>

<CancelOrRejectPopup

Check warning on line 411 in src/Pages/Withdrawals.razor

View workflow job for this annotation

GitHub Actions / build-and-test

Component 'CancelOrRejectPopup' expects a value for the parameter 'Reason', but a value may not have been provided.
@ref="@_rejectCancelModalRef"
Title='@("Wallet withdrawal:" + _selectedRequest?.Id)'
Validator="@RejectReasonValidator"
Expand Down Expand Up @@ -1012,8 +1012,7 @@
var map = new JobDataMap();
map.Put("withdrawalRequestId", _selectedRequest.Id);

var retryList = RetriableJob.ParseRetryListFromString(Constants.JOB_RETRY_INTERVAL_LIST_IN_MINUTES);
var job = RetriableJob.Create<PerformWithdrawalJob>(map, _selectedRequest.Id.ToString(), retryList);
var job = SimpleJob.Create<PerformWithdrawalJob>(map, _selectedRequest.Id.ToString());
await scheduler.ScheduleJob(job.Job, job.Trigger);

if (_selectedRequest != null)
Expand Down Expand Up @@ -1066,4 +1065,4 @@
_amount = _minimumWithdrawalAmount;
}

}
}
3 changes: 1 addition & 2 deletions src/Rpc/NodeGuardService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,7 @@ await _coinSelectionService.LockUTXOs(utxos, withdrawalRequest,
{
var map = new JobDataMap();
map.Put("withdrawalRequestId", withdrawalRequest.Id);
var retryList = RetriableJob.ParseRetryListFromString(Constants.JOB_RETRY_INTERVAL_LIST_IN_MINUTES);
var job = RetriableJob.Create<PerformWithdrawalJob>(map, withdrawalRequest.Id.ToString(), retryList);
var job = SimpleJob.Create<PerformWithdrawalJob>(map, withdrawalRequest.Id.ToString());
await _scheduler.ScheduleJob(job.Job, job.Trigger);
}

Expand Down
Loading