Skip to content

Commit de24c46

Browse files
alvaswalvasw
committed
api: Remove deprecated getmyoffer
The getmyoffer api was deprecated in 2021.
1 parent 5f5938b commit de24c46

File tree

8 files changed

+4
-90
lines changed

8 files changed

+4
-90
lines changed

‎cli/src/main/java/bisq/cli/CliMain.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -468,17 +468,6 @@ public static void run(String[] args) {
468468
new TableBuilder(OFFER_TBL, offer).build().print(out);
469469
return;
470470
}
471-
case getmyoffer: {
472-
var opts = new OfferIdOptionParser(args).parse();
473-
if (opts.isForHelp()) {
474-
out.println(client.getMethodHelp(method));
475-
return;
476-
}
477-
var offerId = opts.getOfferId();
478-
var offer = client.getMyOffer(offerId);
479-
new TableBuilder(OFFER_TBL, offer).build().print(out);
480-
return;
481-
}
482471
case getoffers: {
483472
var opts = new GetOffersOptionParser(args).parse();
484473
if (opts.isForHelp()) {
@@ -941,8 +930,6 @@ private static void printHelp(OptionParser parser, @SuppressWarnings("SameParame
941930
stream.println();
942931
stream.format(rowFormat, getoffer.name(), "--offer-id=<offer-id>", "Get current offer with id");
943932
stream.println();
944-
stream.format(rowFormat, getmyoffer.name(), "--offer-id=<offer-id>", "Get my current offer with id");
945-
stream.println();
946933
stream.format(rowFormat, getoffers.name(), "--direction=<buy|sell> \\", "Get current offers");
947934
stream.format(rowFormat, "", "--currency-code=<currency-code>", "");
948935
stream.println();

‎cli/src/main/java/bisq/cli/GrpcClient.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -291,12 +291,6 @@ public OfferInfo getOffer(String offerId) {
291291
return offersServiceRequest.getOffer(offerId);
292292
}
293293

294-
@Deprecated // Since 5-Dec-2021.
295-
// Endpoint to be removed from future version. Use getOffer service method instead.
296-
public OfferInfo getMyOffer(String offerId) {
297-
return offersServiceRequest.getMyOffer(offerId);
298-
}
299-
300294
public List<OfferInfo> getBsqSwapOffers(String direction) {
301295
return offersServiceRequest.getBsqSwapOffers(direction);
302296
}

‎cli/src/main/java/bisq/cli/Method.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ public enum Method {
3434
getbalance,
3535
getbtcprice,
3636
getfundingaddresses,
37-
@Deprecated // Since 27-Dec-2021.
38-
getmyoffer, // Endpoint to be removed from future version. Use getoffer instead.
3937
getmyoffers,
4038
getnetwork,
4139
getoffer,

‎cli/src/main/java/bisq/cli/request/OffersServiceRequest.java‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import bisq.proto.grpc.CreateOfferRequest;
2323
import bisq.proto.grpc.EditOfferRequest;
2424
import bisq.proto.grpc.GetBsqSwapOffersRequest;
25-
import bisq.proto.grpc.GetMyOfferRequest;
2625
import bisq.proto.grpc.GetMyOffersRequest;
2726
import bisq.proto.grpc.GetOfferCategoryRequest;
2827
import bisq.proto.grpc.GetOfferRequest;
@@ -125,7 +124,7 @@ public OfferInfo createOffer(String direction,
125124
}
126125

127126
public void editOfferActivationState(String offerId, int enable) {
128-
var offer = getMyOffer(offerId);
127+
var offer = getOffer(offerId);
129128
var offerPrice = offer.getUseMarketBasedPrice()
130129
? "0.00"
131130
: offer.getPrice();
@@ -139,7 +138,7 @@ public void editOfferActivationState(String offerId, int enable) {
139138
}
140139

141140
public void editOfferFixedPrice(String offerId, String rawPriceString) {
142-
var offer = getMyOffer(offerId);
141+
var offer = getOffer(offerId);
143142
editOffer(offerId,
144143
rawPriceString,
145144
false,
@@ -150,7 +149,7 @@ public void editOfferFixedPrice(String offerId, String rawPriceString) {
150149
}
151150

152151
public void editOfferPriceMargin(String offerId, double marketPriceMarginPct) {
153-
var offer = getMyOffer(offerId);
152+
var offer = getOffer(offerId);
154153
editOffer(offerId,
155154
"0.00",
156155
true,
@@ -161,7 +160,7 @@ public void editOfferPriceMargin(String offerId, double marketPriceMarginPct) {
161160
}
162161

163162
public void editOfferTriggerPrice(String offerId, String triggerPrice) {
164-
var offer = getMyOffer(offerId);
163+
var offer = getOffer(offerId);
165164
editOffer(offerId,
166165
"0.00",
167166
offer.getUseMarketBasedPrice(),
@@ -216,13 +215,6 @@ public OfferInfo getOffer(String offerId) {
216215
return grpcStubs.offersService.getOffer(request).getOffer();
217216
}
218217

219-
public OfferInfo getMyOffer(String offerId) {
220-
var request = GetMyOfferRequest.newBuilder()
221-
.setId(offerId)
222-
.build();
223-
return grpcStubs.offersService.getMyOffer(request).getOffer();
224-
}
225-
226218
public List<OfferInfo> getBsqSwapOffers(String direction) {
227219
var request = GetBsqSwapOffersRequest.newBuilder()
228220
.setDirection(direction)

‎core/src/main/java/bisq/core/api/CoreApi.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,6 @@ public Optional<Offer> findAvailableOffer(String id) {
150150
return coreOffersService.findAvailableOffer(id);
151151
}
152152

153-
public OpenOffer getMyOffer(String id) {
154-
return coreOffersService.getMyOffer(id);
155-
}
156-
157153
public Optional<OpenOffer> findMyOpenOffer(String id) {
158154
return coreOffersService.findMyOpenOffer(id);
159155
}

‎core/src/main/resources/help/getmyoffer-help.txt‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎daemon/src/main/java/bisq/daemon/grpc/GrpcOffersService.java‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import bisq.proto.grpc.GetBsqSwapOffersRequest;
3636
import bisq.proto.grpc.GetMyBsqSwapOfferReply;
3737
import bisq.proto.grpc.GetMyBsqSwapOffersReply;
38-
import bisq.proto.grpc.GetMyOfferReply;
3938
import bisq.proto.grpc.GetMyOfferRequest;
4039
import bisq.proto.grpc.GetMyOffersReply;
4140
import bisq.proto.grpc.GetMyOffersRequest;
@@ -58,7 +57,6 @@
5857

5958
import lombok.extern.slf4j.Slf4j;
6059

61-
import static bisq.core.api.model.OfferInfo.toMyOfferInfo;
6260
import static bisq.core.api.model.OfferInfo.toMyPendingOfferInfo;
6361
import static bisq.core.api.model.OfferInfo.toOfferInfo;
6462
import static bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor;
@@ -154,23 +152,6 @@ public void getMyBsqSwapOffer(GetMyOfferRequest req,
154152
}
155153
}
156154

157-
@Deprecated // Since 27-Dec-2021.
158-
// Endpoint to be removed from future version. Use getOffer service method instead.
159-
@Override
160-
public void getMyOffer(GetMyOfferRequest req,
161-
StreamObserver<GetMyOfferReply> responseObserver) {
162-
try {
163-
OpenOffer openOffer = coreApi.getMyOffer(req.getId());
164-
var reply = GetMyOfferReply.newBuilder()
165-
.setOffer(toMyOfferInfo(openOffer).toProtoMessage())
166-
.build();
167-
responseObserver.onNext(reply);
168-
responseObserver.onCompleted();
169-
} catch (Throwable cause) {
170-
exceptionHandler.handleException(log, cause, responseObserver);
171-
}
172-
}
173-
174155
@Override
175156
public void getBsqSwapOffers(GetBsqSwapOffersRequest req,
176157
StreamObserver<GetBsqSwapOffersReply> responseObserver) {
@@ -349,7 +330,6 @@ final Optional<ServerInterceptor> rateMeteringInterceptor() {
349330
new HashMap<>() {{
350331
put(getGetOfferCategoryMethod().getFullMethodName(), new GrpcCallRateMeter(1, SECONDS));
351332
put(getGetOfferMethod().getFullMethodName(), new GrpcCallRateMeter(1, SECONDS));
352-
put(getGetMyOfferMethod().getFullMethodName(), new GrpcCallRateMeter(1, SECONDS));
353333
put(getGetOffersMethod().getFullMethodName(), new GrpcCallRateMeter(1, SECONDS));
354334
put(getGetMyOffersMethod().getFullMethodName(), new GrpcCallRateMeter(1, SECONDS));
355335
put(getCreateOfferMethod().getFullMethodName(), new GrpcCallRateMeter(1, MINUTES));

‎proto/src/main/proto/grpc.proto‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ service Offers {
7373
// Get user's BSQ swap offer with offer-id.
7474
rpc GetMyBsqSwapOffer (GetMyOfferRequest) returns (GetMyBsqSwapOfferReply) {
7575
}
76-
// Get my open v1 protocol offer with offer-id. Deprecated since 27-Dec-2021 (v1.8.0). Use GetOffer.
77-
rpc GetMyOffer (GetMyOfferRequest) returns (GetMyOfferReply) {
78-
}
7976
// Get all available BSQ swap offers with a BUY (BTC) or SELL (BTC) direction.
8077
rpc GetBsqSwapOffers (GetBsqSwapOffersRequest) returns (GetBsqSwapOffersReply) {
8178
}
@@ -140,11 +137,6 @@ message GetMyOfferRequest {
140137
string id = 1; // The offer's unique identifier.
141138
}
142139

143-
// Deprecated with rpc method GetMyOffer since 27-Dec-2021 (v1.8.0).
144-
message GetMyOfferReply {
145-
OfferInfo offer = 1; // The returned v1 protocol offer.
146-
}
147-
148140
message GetOffersRequest {
149141
string direction = 1; // The offer's BUY (BTC) or SELL (BTC) direction.
150142
string currency_code = 2; // The offer's fiat or altcoin currency code.

0 commit comments

Comments
 (0)