Prepare for createoffer development

This change is to tidy up the code supporting createoffer functionality. * Delete an unused, extra createOffer(...) method in CoreApi that takes an offerId argument. * Delete a comment that should not have been added in the first place from grpc.proto. * Change the CreateOfferReply return type from bool to string (offerId). After createoffer impl is completed, CreateOfferReply should return a proto containing important offer details. * Change GrpcOffersService's CreateOfferReply ID field value = "todo". Note: this change will be part of a new createoffer PR, but not these particular comments.
ghubstan · Aug 22, 2020 · 4d25596 · 4d25596
1 parent ea56c87
commit 4d25596
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 33 deletions.
diff --git a/core/src/main/java/bisq/core/api/CoreApi.java b/core/src/main/java/bisq/core/api/CoreApi.java
@@ -18,18 +18,14 @@
 package bisq.core.api;
 
 import bisq.core.api.model.AddressBalanceInfo;
-import bisq.core.monetary.Price;
 import bisq.core.offer.Offer;
-import bisq.core.offer.OfferPayload;
 import bisq.core.payment.PaymentAccount;
 import bisq.core.trade.handlers.TransactionResultHandler;
 import bisq.core.trade.statistics.TradeStatistics2;
 import bisq.core.trade.statistics.TradeStatisticsManager;
 
 import bisq.common.app.Version;
 
-import org.bitcoinj.core.Coin;
-
 import javax.inject.Inject;
 
 import java.util.ArrayList;
@@ -105,32 +101,6 @@ public void createOffer(String currencyCode,
                 resultHandler);
     }
 
-    public void createOffer(String offerId,
-                            String currencyCode,
-                            OfferPayload.Direction direction,
-                            Price price,
-                            boolean useMarketBasedPrice,
-                            double marketPriceMargin,
-                            Coin amount,
-                            Coin minAmount,
-                            double buyerSecurityDeposit,
-                            PaymentAccount paymentAccount,
-                            boolean useSavingsWallet,
-                            TransactionResultHandler resultHandler) {
-        coreOffersService.createOffer(offerId,
-                currencyCode,
-                direction,
-                price,
-                useMarketBasedPrice,
-                marketPriceMargin,
-                amount,
-                minAmount,
-                buyerSecurityDeposit,
-                paymentAccount,
-                useSavingsWallet,
-                resultHandler);
-    }
-
     ///////////////////////////////////////////////////////////////////////////////////////////
     // PaymentAccounts
     ///////////////////////////////////////////////////////////////////////////////////////////

diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcOffersService.java b/daemon/src/main/java/bisq/daemon/grpc/GrpcOffersService.java
@@ -87,7 +87,7 @@ public void getOffers(GetOffersRequest req,
     public void createOffer(CreateOfferRequest req,
                             StreamObserver<CreateOfferReply> responseObserver) {
         TransactionResultHandler resultHandler = transaction -> {
-            CreateOfferReply reply = CreateOfferReply.newBuilder().setResult(true).build();
+            CreateOfferReply reply = CreateOfferReply.newBuilder().setId("todo").build();
             responseObserver.onNext(reply);
             responseObserver.onCompleted();
         };

diff --git a/proto/src/main/proto/grpc.proto b/proto/src/main/proto/grpc.proto
@@ -76,7 +76,7 @@ message GetOffersReply {
 }
 
 message CreateOfferRequest {
-    string currencyCode = 1; // TODO switch order w/ direction field in next PR
+    string currencyCode = 1;
     string direction = 2;
     uint64 price = 3;
     bool useMarketBasedPrice = 4;
@@ -88,7 +88,7 @@ message CreateOfferRequest {
 }
 
 message CreateOfferReply {
-    bool result = 1;
+    string id = 1;
 }
 
 message OfferInfo {