From bf14c65c8bd29e071ab5180a3bfb82c60dc8c5bc Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Wed, 29 Dec 2021 09:59:48 -0300
Subject: [PATCH] Remove duplicated methods after conflict resolution attempt

---
 .../java/bisq/core/api/CoreOffersService.java | 32 -------------------
 1 file changed, 32 deletions(-)

diff --git a/core/src/main/java/bisq/core/api/CoreOffersService.java b/core/src/main/java/bisq/core/api/CoreOffersService.java
index 71b533282b1..f321ad17d0c 100644
--- a/core/src/main/java/bisq/core/api/CoreOffersService.java
+++ b/core/src/main/java/bisq/core/api/CoreOffersService.java
@@ -396,38 +396,6 @@ private void placeOffer(Offer offer,
             throw new IllegalStateException(offer.getErrorMessage());
     }
 
-    private Optional<Offer> findAvailableBsqSwapOffer(String id) {
-        return offerBookService.getOffers().stream()
-                .filter(o -> o.getId().equals(id))
-                .filter(o -> !o.isMyOffer(keyRing))
-                .filter(o -> offerFilterService.canTakeOffer(o, coreContext.isApiUser()).isValid())
-                .filter(Offer::isBsqSwapOffer)
-                .findAny();
-    }
-
-    private Optional<Offer> findMyBsqSwapOffer(String id) {
-        return offerBookService.getOffers().stream()
-                .filter(o -> o.getId().equals(id))
-                .filter(o -> o.isMyOffer(keyRing))
-                .filter(Offer::isBsqSwapOffer)
-                .findAny();
-    }
-
-    private Optional<Offer> findAvailableOffer(String id) {
-        return offerBookService.getOffers().stream()
-                .filter(o -> o.getId().equals(id))
-                .filter(o -> !o.isMyOffer(keyRing))
-                .filter(o -> offerFilterService.canTakeOffer(o, coreContext.isApiUser()).isValid())
-                .findAny();
-    }
-
-    private Optional<OpenOffer> findMyOpenOffer(String id) {
-        return openOfferManager.getObservableList().stream()
-                .filter(o -> o.getId().equals(id))
-                .filter(o -> o.getOffer().isMyOffer(keyRing))
-                .findAny();
-    }
-
     private OfferPayload getMergedOfferPayload(EditOfferValidator editOfferValidator,
                                                OpenOffer openOffer,
                                                String editedPriceAsString,