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.

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

Jump to bottom

Improve takeoffer error handing #5294

Merged
merged 8 commits into from Mar 19, 2021
Merged

Improve takeoffer error handing #5294

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5c097d3
Adjust protos for takeoffer error handing
ghubstan Mar 10, 2021
067a5c7
Inject CoreContext into OpenOfferManager, adjust test
ghubstan Mar 10, 2021
d0590d9
Adjust grpc & core services to new takeoffer error handling
ghubstan Mar 10, 2021
697cf66
Convert AvailabilityResult to error msg when takeoffer fails
ghubstan Mar 10, 2021
d4d989d
Add missing grpc exception catch blocks
ghubstan Mar 10, 2021
48ecb5b
Derive AvailabilityResult from Task errorMessage
ghubstan Mar 10, 2021
4a68773
Merge branch 'master' into 01-fix-takeoffer-err-handling
ghubstan Mar 14, 2021
1d56d79
Refactor takeoffer reply proto & ErrorMessageHandler
ghubstan Mar 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 27 additions & 9 deletions daemon/src/main/java/bisq/daemon/grpc/GrpcErrorMessageHandler.java
View file
Open in desktop
Expand Up @@ -30,6 +30,8 @@
import lombok.Getter;

import static bisq.proto.grpc.TradesGrpc.getTakeOfferMethod;
import static java.lang.String.format;
import static java.util.Arrays.stream;

/**
* An implementation of bisq.common.handlers.ErrorMessageHandler that avoids
Expand Down Expand Up @@ -76,7 +78,7 @@ public void handleErrorMessage(String errorMessage) {
log.error(errorMessage);

if (isTakeOfferError()) {
handleTakeOfferError();
handleTakeOfferError(errorMessage);
} else {
exceptionHandler.handleErrorMessage(log,
errorMessage,
Expand All @@ -85,17 +87,33 @@ public void handleErrorMessage(String errorMessage) {
}
}

private void handleTakeOfferError() {
private void handleTakeOfferError(String errorMessage) {
// Send the AvailabilityResult to the client instead of throwing an exception.
// The client should look at the grpc reply object's AvailabilityResult
// field if reply.hasTrade = false, and use it give the user a human readable msg.
StreamObserver<TakeOfferReply> takeOfferResponseObserver = (StreamObserver<TakeOfferReply>) responseObserver;
var availabilityResult = AvailabilityResult.valueOf("MAKER_DENIED_API_USER");
var reply = TakeOfferReply.newBuilder()
.setAvailabilityResult(availabilityResult)
.build();
takeOfferResponseObserver.onNext(reply);
takeOfferResponseObserver.onCompleted();
try {
AvailabilityResult availabilityResult = getAvailabilityResult(errorMessage);
var reply = TakeOfferReply.newBuilder()
.setAvailabilityResult(availabilityResult)
.build();
@SuppressWarnings("unchecked")
var takeOfferResponseObserver = (StreamObserver<TakeOfferReply>) responseObserver;
takeOfferResponseObserver.onNext(reply);
takeOfferResponseObserver.onCompleted();
} catch (IllegalArgumentException ex) {
log.error("", ex);
exceptionHandler.handleErrorMessage(log,
errorMessage,
responseObserver);
}
}

private AvailabilityResult getAvailabilityResult(String errorMessage) {
return stream(AvailabilityResult.values())
.filter((e) -> errorMessage.toUpperCase().contains(e.name()))
.findFirst().orElseThrow(() ->
new IllegalArgumentException(
format("Could not find an AvailabilityResult in error message:%n%s", errorMessage)));
}

private boolean isTakeOfferError() {
Expand Down