Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2024-10-01 01:35:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

re-enable testStartEditOfferForActiveOffer()

Browse Source
This commit is contained in:
woodser 2023-08-19 07:07:05 -04:00
parent 8985f84d77
commit b077d532fa
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -557,9 +557,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
ResultHandler resultHandler, ResultHandler resultHandler,
ErrorMessageHandler errorMessageHandler) { ErrorMessageHandler errorMessageHandler) {
Offer offer = openOffer.getOffer(); Offer offer = openOffer.getOffer();
if (openOffer.isScheduled()) { if (openOffer.isAvailable()) {
resultHandler.handleResult(); // ignore if scheduled
} else {
offerBookService.deactivateOffer(offer.getOfferPayload(), offerBookService.deactivateOffer(offer.getOfferPayload(),
() -> { () -> {
openOffer.setState(OpenOffer.State.DEACTIVATED); openOffer.setState(OpenOffer.State.DEACTIVATED);
@ -568,6 +566,8 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
resultHandler.handleResult(); resultHandler.handleResult();
}, },
errorMessageHandler); errorMessageHandler);
} else {
resultHandler.handleResult(); // ignore if unavailable
} }
} }
@ -598,15 +598,15 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
offersToBeEdited.put(openOffer.getId(), openOffer); offersToBeEdited.put(openOffer.getId(), openOffer);
if (openOffer.isDeactivated()) { if (openOffer.isAvailable()) {
resultHandler.handleResult();
} else {
deactivateOpenOffer(openOffer, deactivateOpenOffer(openOffer,
resultHandler, resultHandler,
errorMessage -> { errorMessage -> {
offersToBeEdited.remove(openOffer.getId()); offersToBeEdited.remove(openOffer.getId());
errorMessageHandler.handleErrorMessage(errorMessage); errorMessageHandler.handleErrorMessage(errorMessage);
}); });
} else {
resultHandler.handleResult();
} }
} }

4
core/src/test/java/haveno/core/offer/OpenOfferManagerTest.java
View File

@ -13,7 +13,6 @@ import haveno.network.p2p.P2PService;
import haveno.network.p2p.peers.PeerManager; import haveno.network.p2p.peers.PeerManager;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.nio.file.Files; import java.nio.file.Files;
@ -51,7 +50,6 @@ public class OpenOfferManagerTest {
} }
@Test @Test
@Disabled // TODO: re-enable when editing offers supported
public void testStartEditOfferForActiveOffer() { public void testStartEditOfferForActiveOffer() {
P2PService p2PService = mock(P2PService.class); P2PService p2PService = mock(P2PService.class);
OfferBookService offerBookService = mock(OfferBookService.class); OfferBookService offerBookService = mock(OfferBookService.class);
@ -89,6 +87,7 @@ public class OpenOfferManagerTest {
}).when(offerBookService).deactivateOffer(any(OfferPayload.class), any(ResultHandler.class), any(ErrorMessageHandler.class)); }).when(offerBookService).deactivateOffer(any(OfferPayload.class), any(ResultHandler.class), any(ErrorMessageHandler.class));
final OpenOffer openOffer = new OpenOffer(make(btcUsdOffer)); final OpenOffer openOffer = new OpenOffer(make(btcUsdOffer));
openOffer.setState(OpenOffer.State.AVAILABLE);
ResultHandler resultHandler = () -> startEditOfferSuccessful.set(true); ResultHandler resultHandler = () -> startEditOfferSuccessful.set(true);
@ -97,7 +96,6 @@ public class OpenOfferManagerTest {
verify(offerBookService, times(1)).deactivateOffer(any(OfferPayload.class), any(ResultHandler.class), any(ErrorMessageHandler.class)); verify(offerBookService, times(1)).deactivateOffer(any(OfferPayload.class), any(ResultHandler.class), any(ErrorMessageHandler.class));
assertTrue(startEditOfferSuccessful.get()); assertTrue(startEditOfferSuccessful.get());
} }
@Test @Test