mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-03 18:56:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Derive AvailabilityResult from Task errorMessage

Browse source
This commit is contained in:
ghubstan 2021-03-10 15:07:34 -03:00 • committed by Christoph Atteneder
parent 56345a2256
commit c58366090f
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
daemon/src/main/java/bisq/daemon/grpc/GrpcErrorMessageHandler.java
View file

@ -30,6 +30,8 @@ import org.slf4j.Logger;
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
@ -76,7 +78,7 @@ public class GrpcErrorMessageHandler implements ErrorMessageHandler {
log.error(errorMessage);
if (isTakeOfferError()) {
handleTakeOfferError();
handleTakeOfferError(errorMessage);
} else {
exceptionHandler.handleErrorMessage(log,
errorMessage,
@ -85,17 +87,33 @@ public class GrpcErrorMessageHandler implements ErrorMessageHandler {
}
}
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() {