Merge pull request #7329 from alvasw/api_getoffers_show_all_offers_by…

…_default getoffers (api): Return all offers by default
bisq-network · Dec 27, 2024 · cfacafd · cfacafd
2 parents 533d6a3 + 0ba23b5
commit cfacafd
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 51 deletions.
diff --git a/apitest/src/test/java/bisq/apitest/method/offer/CreateBSQOffersTest.java b/apitest/src/test/java/bisq/apitest/method/offer/CreateBSQOffersTest.java
@@ -277,7 +277,7 @@ public void testGetAllMyBsqOffers() {
     @Test
     @Order(6)
     public void testGetAvailableBsqOffers() {
-        List<OfferInfo> offers = bobClient.getOffersSortedByDate(BSQ, false);
+        List<OfferInfo> offers = bobClient.getOffersSortedByDate(BSQ);
         log.debug("All Bob's Available BSQ Offers:\n{}", toOffersTable.apply(offers));
         assertEquals(4, offers.size());
         log.debug("BOB'S BALANCES\n{}", formatBalancesTbls(bobClient.getBalances()));

diff --git a/apitest/src/test/java/bisq/apitest/method/offer/CreateXMROffersTest.java b/apitest/src/test/java/bisq/apitest/method/offer/CreateXMROffersTest.java
@@ -274,7 +274,7 @@ public void testGetAllMyXMROffers() {
     @Test
     @Order(6)
     public void testGetAvailableXMROffers() {
-        List<OfferInfo> offers = bobClient.getOffersSortedByDate(XMR, false);
+        List<OfferInfo> offers = bobClient.getOffersSortedByDate(XMR);
         log.debug("All of Bob's available XMR offers:\n{}", toOffersTable.apply(offers));
         assertEquals(4, offers.size());
         log.debug("Bob's balances\n{}", formatBalancesTbls(bobClient.getBalances()));

diff --git a/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java b/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java
@@ -77,7 +77,7 @@ public void testTakeAlicesBuyOffer(final TestInfo testInfo) {
             // Wait for Alice's AddToOfferBook task.
             // Wait times vary;  my logs show >= 2-second delay.
             var timeout = System.currentTimeMillis() + 3000;
-            while (bobClient.getOffersSortedByDate(USD, true).size() < 1) {
+            while (bobClient.getOffersSortedByDate(USD).size() < 1) {
                 sleep(100);
                 if (System.currentTimeMillis() > timeout)
                     fail(new TimeoutException("Timed out waiting for Offer to be added to OfferBook"));

diff --git a/apitest/src/test/java/bisq/apitest/method/trade/TakeSellBTCOfferTest.java b/apitest/src/test/java/bisq/apitest/method/trade/TakeSellBTCOfferTest.java
@@ -86,7 +86,7 @@ public void testTakeAlicesSellOffer(final TestInfo testInfo) {
                     0L,
                     false);
             sleep(2_500);  // Allow available offer to be removed from offer book.
-            var takeableUsdOffers = bobClient.getOffersSortedByDate(SELL.name(), USD, false);
+            var takeableUsdOffers = bobClient.getOffersSortedByDate(SELL.name(), USD);
             assertEquals(0, takeableUsdOffers.size());
 
             trade = bobClient.getTrade(tradeId);

diff --git a/cli/src/main/java/bisq/cli/CliMain.java b/cli/src/main/java/bisq/cli/CliMain.java
@@ -487,8 +487,7 @@ public static void run(String[] args) {
                     }
                     var direction = opts.getDirection();
                     var currencyCode = opts.getCurrencyCode();
-                    var all = opts.getAll();
-                    List<OfferInfo> offers = client.getOffers(direction, currencyCode, all);
+                    List<OfferInfo> offers = client.getOffers(direction, currencyCode);
                     if (offers.isEmpty())
                         out.printf("no %s %s offers found%n", direction, currencyCode);
                     else

diff --git a/cli/src/main/java/bisq/cli/GrpcClient.java b/cli/src/main/java/bisq/cli/GrpcClient.java
@@ -301,16 +301,16 @@ public List<OfferInfo> getBsqSwapOffers(String direction) {
         return offersServiceRequest.getBsqSwapOffers(direction);
     }
 
-    public List<OfferInfo> getOffers(String direction, String currencyCode, boolean all) {
-        return offersServiceRequest.getOffers(direction, currencyCode, all);
+    public List<OfferInfo> getOffers(String direction, String currencyCode) {
+        return offersServiceRequest.getOffers(direction, currencyCode);
     }
 
-    public List<OfferInfo> getOffersSortedByDate(String currencyCode, boolean all) {
-        return offersServiceRequest.getOffersSortedByDate(currencyCode, all);
+    public List<OfferInfo> getOffersSortedByDate(String currencyCode) {
+        return offersServiceRequest.getOffersSortedByDate(currencyCode);
     }
 
-    public List<OfferInfo> getOffersSortedByDate(String direction, String currencyCode, boolean all) {
-        return offersServiceRequest.getOffersSortedByDate(direction, currencyCode, all);
+    public List<OfferInfo> getOffersSortedByDate(String direction, String currencyCode) {
+        return offersServiceRequest.getOffersSortedByDate(direction, currencyCode);
     }
 
     public List<OfferInfo> getBsqSwapOffersSortedByDate() {

diff --git a/cli/src/main/java/bisq/cli/opts/GetOffersOptionParser.java b/cli/src/main/java/bisq/cli/opts/GetOffersOptionParser.java
@@ -20,7 +20,6 @@
 
 import joptsimple.OptionSpec;
 
-import static bisq.cli.opts.OptLabel.OPT_ALL;
 import static bisq.cli.opts.OptLabel.OPT_CURRENCY_CODE;
 import static bisq.cli.opts.OptLabel.OPT_DIRECTION;
 
@@ -32,11 +31,6 @@ public class GetOffersOptionParser extends AbstractMethodOptionParser implements
     final OptionSpec<String> currencyCodeOpt = parser.accepts(OPT_CURRENCY_CODE, "currency code (bsq|xmr|eur|usd|...)")
             .withRequiredArg();
 
-    final OptionSpec<Boolean> allOpt = parser.accepts(OPT_ALL, "get all offers")
-            .withOptionalArg()
-            .ofType(boolean.class)
-            .defaultsTo(Boolean.FALSE);
-
     public GetOffersOptionParser(String[] args) {
         super(args);
     }
@@ -64,8 +58,4 @@ public String getDirection() {
     public String getCurrencyCode() {
         return options.valueOf(currencyCodeOpt);
     }
-
-    public boolean getAll() {
-        return options.valueOf(allOpt);
-    }
 }
diff --git a/cli/src/main/java/bisq/cli/opts/OptLabel.java b/cli/src/main/java/bisq/cli/opts/OptLabel.java
@@ -26,7 +26,6 @@ public class OptLabel {
     public final static String OPT_AMOUNT = "amount";
     public final static String OPT_CATEGORY = "category";
     public final static String OPT_CURRENCY_CODE = "currency-code";
-    public final static String OPT_ALL = "all";
     public final static String OPT_DAYS = "days";
     public final static String OPT_DIRECTION = "direction";
     public final static String OPT_DISPUTE_AGENT_TYPE = "dispute-agent-type";

diff --git a/cli/src/main/java/bisq/cli/request/OffersServiceRequest.java b/cli/src/main/java/bisq/cli/request/OffersServiceRequest.java
@@ -231,24 +231,23 @@ public List<OfferInfo> getBsqSwapOffers(String direction) {
         return grpcStubs.offersService.getBsqSwapOffers(request).getBsqSwapOffersList();
     }
 
-    public List<OfferInfo> getOffers(String direction, String currencyCode, boolean all) {
+    public List<OfferInfo> getOffers(String direction, String currencyCode) {
         var request = GetOffersRequest.newBuilder()
                 .setDirection(direction)
                 .setCurrencyCode(currencyCode)
-                .setAll(all)
                 .build();
         return grpcStubs.offersService.getOffers(request).getOffersList();
     }
 
-    public List<OfferInfo> getOffersSortedByDate(String currencyCode, boolean all) {
+    public List<OfferInfo> getOffersSortedByDate(String currencyCode) {
         ArrayList<OfferInfo> offers = new ArrayList<>();
-        offers.addAll(getOffers(BUY.name(), currencyCode, all));
-        offers.addAll(getOffers(SELL.name(), currencyCode, all));
+        offers.addAll(getOffers(BUY.name(), currencyCode));
+        offers.addAll(getOffers(SELL.name(), currencyCode));
         return offers.isEmpty() ? offers : sortOffersByDate(offers);
     }
 
-    public List<OfferInfo> getOffersSortedByDate(String direction, String currencyCode, boolean all) {
-        var offers = getOffers(direction, currencyCode, all);
+    public List<OfferInfo> getOffersSortedByDate(String direction, String currencyCode) {
+        var offers = getOffers(direction, currencyCode);
         return offers.isEmpty() ? offers : sortOffersByDate(offers);
     }
 
@@ -293,8 +292,8 @@ public List<OfferInfo> getMyBsqSwapOffersSortedByDate() {
         return sortOffersByDate(offers);
     }
 
-    public OfferInfo getMostRecentOffer(String direction, String currencyCode, boolean all) {
-        List<OfferInfo> offers = getOffersSortedByDate(direction, currencyCode, all);
+    public OfferInfo getMostRecentOffer(String direction, String currencyCode) {
+        List<OfferInfo> offers = getOffersSortedByDate(direction, currencyCode);
         return offers.isEmpty() ? null : offers.get(offers.size() - 1);
     }
 

diff --git a/cli/src/test/java/bisq/cli/table/GetOffersCliOutputDiffTest.java b/cli/src/test/java/bisq/cli/table/GetOffersCliOutputDiffTest.java
@@ -59,12 +59,12 @@ private void getMySellUsdOffers() {
     }
 
     private void getAvailableBuyUsdOffers() {
-        var offers = bobClient.getOffers(BUY.name(), "USD", false);
+        var offers = bobClient.getOffers(BUY.name(), "USD");
         printAndCheckDiffs(offers, BUY.name(), "USD");
     }
 
     private void getAvailableSellUsdOffers() {
-        var offers = bobClient.getOffers(SELL.name(), "USD", false);
+        var offers = bobClient.getOffers(SELL.name(), "USD");
         printAndCheckDiffs(offers, SELL.name(), "USD");
     }
 
@@ -79,12 +79,12 @@ private void getMySellXmrOffers() {
     }
 
     private void getAvailableBuyXmrOffers() {
-        var offers = bobClient.getOffers(BUY.name(), "XMR", false);
+        var offers = bobClient.getOffers(BUY.name(), "XMR");
         printAndCheckDiffs(offers, BUY.name(), "XMR");
     }
 
     private void getAvailableSellXmrOffers() {
-        var offers = bobClient.getOffers(SELL.name(), "XMR", false);
+        var offers = bobClient.getOffers(SELL.name(), "XMR");
         printAndCheckDiffs(offers, SELL.name(), "XMR");
     }
 
@@ -99,12 +99,12 @@ private void getMySellBsqOffers() {
     }
 
     private void getAvailableBuyBsqOffers() {
-        var offers = bobClient.getOffers(BUY.name(), "BSQ", false);
+        var offers = bobClient.getOffers(BUY.name(), "BSQ");
         printAndCheckDiffs(offers, BUY.name(), "BSQ");
     }
 
     private void getAvailableSellBsqOffers() {
-        var offers = bobClient.getOffers(SELL.name(), "BSQ", false);
+        var offers = bobClient.getOffers(SELL.name(), "BSQ");
         printAndCheckDiffs(offers, SELL.name(), "BSQ");
     }
 

diff --git a/core/src/main/java/bisq/core/api/CoreApi.java b/core/src/main/java/bisq/core/api/CoreApi.java
@@ -166,8 +166,8 @@ public List<Offer> getBsqSwapOffers(String direction) {
         return coreOffersService.getBsqSwapOffers(direction);
     }
 
-    public List<Offer> getOffers(String direction, String currencyCode, boolean all) {
-        return coreOffersService.getOffers(direction, currencyCode, all);
+    public List<Offer> getOffers(String direction, String currencyCode) {
+        return coreOffersService.getOffers(direction, currencyCode);
     }
 
     public List<OpenOffer> getMyOffers(String direction, String currencyCode) {

diff --git a/core/src/main/java/bisq/core/api/CoreOffersService.java b/core/src/main/java/bisq/core/api/CoreOffersService.java
@@ -206,14 +206,12 @@ List<Offer> getBsqSwapOffers(String direction) {
                 .collect(Collectors.toList());
     }
 
-    List<Offer> getOffers(String direction, String currencyCode, boolean all) {
+    List<Offer> getOffers(String direction, String currencyCode) {
         var upperCaseCurrencyCode = currencyCode.toUpperCase();
         var isFiat = isFiatCurrency(upperCaseCurrencyCode);
         if (isFiat) {
             return offerBookService.getOffers().stream()
-                    .filter(o -> !o.isMyOffer(keyRing))
                     .filter(o -> offerMatchesDirectionAndCurrency(o, direction, upperCaseCurrencyCode))
-                    .filter(o -> all || offerFilterService.canTakeOffer(o, coreContext.isApiUser()).isValid())
                     .sorted(priceComparator(direction, true))
                     .collect(Collectors.toList());
         } else {
@@ -223,10 +221,8 @@ List<Offer> getOffers(String direction, String currencyCode, boolean all) {
             // then filter on the currencyCode param (the altcoin code).
             if (apiSupportsCryptoCurrency(upperCaseCurrencyCode))
                 return offerBookService.getOffers().stream()
-                        .filter(o -> !o.isMyOffer(keyRing))
                         .filter(o -> offerMatchesDirectionAndCurrency(o, direction, "BTC"))
                         .filter(o -> o.getBaseCurrencyCode().equalsIgnoreCase(upperCaseCurrencyCode))
-                        .filter(o -> all || offerFilterService.canTakeOffer(o, coreContext.isApiUser()).isValid())
                         .sorted(priceComparator(direction, false))
                         .collect(Collectors.toList());
             else

diff --git a/core/src/main/resources/help/getoffers-help.txt b/core/src/main/resources/help/getoffers-help.txt
@@ -9,7 +9,6 @@ SYNOPSIS
 getoffers
 		--direction=<buy|sell>
 		--currency-code=<eur|usd>
-		--all=<true|false>
 
 DESCRIPTION
 -----------
@@ -25,9 +24,6 @@ OPTIONS
 --currency-code
 		The three letter code for the fiat used to buy or sell BTC, e.g., EUR, USD, BRL, ...
 
---all
-		Whether return all offers or only these matching my accounts
-
 EXAMPLES
 --------
 You have one Brazilian Real payment account with a face-to-face payment method type.

diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcOffersService.java b/daemon/src/main/java/bisq/daemon/grpc/GrpcOffersService.java
@@ -195,7 +195,7 @@ public void getBsqSwapOffers(GetBsqSwapOffersRequest req,
     public void getOffers(GetOffersRequest req,
                           StreamObserver<GetOffersReply> responseObserver) {
         try {
-            List<OfferInfo> result = coreApi.getOffers(req.getDirection(), req.getCurrencyCode(), req.getAll())
+            List<OfferInfo> result = coreApi.getOffers(req.getDirection(), req.getCurrencyCode())
                     .stream()
                     .map(OfferInfo::toOfferInfo)
                     .collect(Collectors.toList());

diff --git a/proto/src/main/proto/grpc.proto b/proto/src/main/proto/grpc.proto
@@ -148,7 +148,7 @@ message GetMyOfferReply {
 message GetOffersRequest {
     string direction = 1;       // The offer's BUY (BTC) or SELL (BTC) direction.
     string currency_code = 2;   // The offer's fiat or altcoin currency code.
-    bool all = 3;               // Return all or only these matching my account
+    reserved 3; // This was the "all" field before.
 }
 
 message GetOffersReply {