nihilist/haveno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cancel offer waits for result

Browse Source
This commit is contained in:
woodser 2024-03-15 10:07:31 -04:00
parent 4a57b26469
commit 216260da85
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/haveno/core/api/CoreApi.java
View File

@ -458,8 +458,8 @@ public class CoreApi {
paymentAccount); paymentAccount);
} }
public void cancelOffer(String id) { public void cancelOffer(String id, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
coreOffersService.cancelOffer(id); coreOffersService.cancelOffer(id, resultHandler, errorMessageHandler);
} }
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////

10
core/src/main/java/haveno/core/api/CoreOffersService.java
View File

@ -38,6 +38,7 @@ import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import haveno.common.crypto.KeyRing; import haveno.common.crypto.KeyRing;
import haveno.common.handlers.ErrorMessageHandler; import haveno.common.handlers.ErrorMessageHandler;
import haveno.common.handlers.ResultHandler;
import static haveno.common.util.MathUtils.exactMultiply; import static haveno.common.util.MathUtils.exactMultiply;
import static haveno.common.util.MathUtils.roundDoubleToLong; import static haveno.common.util.MathUtils.roundDoubleToLong;
import static haveno.common.util.MathUtils.scaleUpByPowerOf10; import static haveno.common.util.MathUtils.scaleUpByPowerOf10;
@ -236,14 +237,9 @@ public class CoreOffersService {
paymentAccount); paymentAccount);
} }
void cancelOffer(String id) { void cancelOffer(String id, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
Offer offer = getMyOffer(id).getOffer(); Offer offer = getMyOffer(id).getOffer();
openOfferManager.removeOffer(offer, openOfferManager.removeOffer(offer, resultHandler, errorMessageHandler);
() -> {
},
errorMessage -> {
throw new IllegalStateException(errorMessage);
});
} }
// -------------------------- PRIVATE HELPERS ----------------------------- // -------------------------- PRIVATE HELPERS -----------------------------

6
core/src/main/java/haveno/core/offer/OpenOfferManager.java
View File

@ -620,9 +620,13 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
if (!offersToBeEdited.containsKey(openOffer.getId())) { if (!offersToBeEdited.containsKey(openOffer.getId())) {
if (openOffer.isDeactivated()) { if (openOffer.isDeactivated()) {
onCancelled(openOffer); onCancelled(openOffer);
resultHandler.handleResult();
} else { } else {
offerBookService.removeOffer(openOffer.getOffer().getOfferPayload(), offerBookService.removeOffer(openOffer.getOffer().getOfferPayload(),
() -> onCancelled(openOffer), () -> {
onCancelled(openOffer);
resultHandler.handleResult();
},
errorMessageHandler); errorMessageHandler);
} }
} else { } else {

15
daemon/src/main/java/haveno/daemon/grpc/GrpcOffersService.java
View File

@ -140,11 +140,7 @@ class GrpcOffersService extends OffersImplBase {
@Override @Override
public void postOffer(PostOfferRequest req, public void postOffer(PostOfferRequest req,
StreamObserver<PostOfferReply> responseObserver) { StreamObserver<PostOfferReply> responseObserver) {
GrpcErrorMessageHandler errorMessageHandler = GrpcErrorMessageHandler errorMessageHandler = new GrpcErrorMessageHandler(getPostOfferMethod().getFullMethodName(), responseObserver, exceptionHandler, log);
new GrpcErrorMessageHandler(getPostOfferMethod().getFullMethodName(),
responseObserver,
exceptionHandler,
log);
try { try {
coreApi.postOffer( coreApi.postOffer(
req.getCurrencyCode(), req.getCurrencyCode(),
@ -170,8 +166,7 @@ class GrpcOffersService extends OffersImplBase {
responseObserver.onCompleted(); responseObserver.onCompleted();
}, },
errorMessage -> { errorMessage -> {
if (!errorMessageHandler.isErrorHandled()) if (!errorMessageHandler.isErrorHandled()) errorMessageHandler.handleErrorMessage(errorMessage);
errorMessageHandler.handleErrorMessage(errorMessage);
}); });
} catch (Throwable cause) { } catch (Throwable cause) {
exceptionHandler.handleException(log, cause, responseObserver); exceptionHandler.handleException(log, cause, responseObserver);
@ -181,11 +176,15 @@ class GrpcOffersService extends OffersImplBase {
@Override @Override
public void cancelOffer(CancelOfferRequest req, public void cancelOffer(CancelOfferRequest req,
StreamObserver<CancelOfferReply> responseObserver) { StreamObserver<CancelOfferReply> responseObserver) {
GrpcErrorMessageHandler errorMessageHandler = new GrpcErrorMessageHandler(getCancelOfferMethod().getFullMethodName(), responseObserver, exceptionHandler, log);
try { try {
coreApi.cancelOffer(req.getId()); coreApi.cancelOffer(req.getId(), () -> {
var reply = CancelOfferReply.newBuilder().build(); var reply = CancelOfferReply.newBuilder().build();
responseObserver.onNext(reply); responseObserver.onNext(reply);
responseObserver.onCompleted(); responseObserver.onCompleted();
}, errorMessage -> {
if (!errorMessageHandler.isErrorHandled()) errorMessageHandler.handleErrorMessage(errorMessage);
});
} catch (Throwable cause) { } catch (Throwable cause) {
exceptionHandler.handleException(log, cause, responseObserver); exceptionHandler.handleException(log, cause, responseObserver);
} }