Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add 'takeoffer' api method #4667

Closed
wants to merge 12 commits into from
Closed

Add 'takeoffer' api method #4667

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c354a69
Refactor OfferUtil into an injected service
ghubstan Oct 15, 2020
5fc5063
Reformat, tidy up OfferUtil
ghubstan Oct 15, 2020
0d11417
Add license comment, reformat CoinUtilTest
ghubstan Oct 15, 2020
baff9a9
Reformat desktop createoffer view & data model tests
ghubstan Oct 15, 2020
b672f4a
Reformat desktop EditOfferDataModelTest
ghubstan Oct 15, 2020
149b228
Resolve argument reassignment issue (found by codacy)
ghubstan Oct 15, 2020
2bf4b0a
Remove unused final fields (found by codacy)
ghubstan Oct 15, 2020
d74719f
Move utility logic from desktop offer models to OfferUtil
ghubstan Oct 17, 2020
f785b3b
Remove unused fields and imports
ghubstan Oct 17, 2020
48c851d
Add 'takeoffer' api method
ghubstan Oct 18, 2020
da0d442
Remove unused field
ghubstan Oct 18, 2020
341ac89
Remove default constructors for codacy
ghubstan Oct 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions core/src/main/java/bisq/core/api/CoreTradesService.java
View file
Open in desktop
Expand Up @@ -18,7 +18,6 @@
package bisq.core.api;

import bisq.core.offer.Offer;
import bisq.core.offer.OfferBookService;
import bisq.core.offer.takeoffer.TakeOfferModel;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;
Expand All @@ -36,16 +35,14 @@
@Slf4j
class CoreTradesService {

private final OfferBookService offerBookService;
private final TakeOfferModel takeOfferModel;
private final TradeManager tradeManager;
private final User user;

@Inject
public CoreTradesService(OfferBookService offerBookService,
TakeOfferModel takeOfferModel, TradeManager tradeManager,
public CoreTradesService(TakeOfferModel takeOfferModel,
TradeManager tradeManager,
User user) {
this.offerBookService = offerBookService;
this.takeOfferModel = takeOfferModel;
this.tradeManager = tradeManager;
this.user = user;
Expand Down
3 changes: 0 additions & 3 deletions core/src/main/java/bisq/core/api/model/OfferInfo.java
View file
Open in desktop
Expand Up @@ -159,9 +159,6 @@ public static class OfferInfoBuilder {
private long date;
private String state;

public OfferInfoBuilder() {
}

public OfferInfoBuilder withId(String id) {
this.id = id;
return this;
Expand Down
5 changes: 1 addition & 4 deletions core/src/main/java/bisq/core/api/model/TradeInfo.java
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
import lombok.EqualsAndHashCode;
import lombok.Getter;

import static bisq.core.api.model.OfferInfo.*;
import static bisq.core.api.model.OfferInfo.toOfferInfo;

@EqualsAndHashCode
@Getter
Expand Down Expand Up @@ -126,9 +126,6 @@ public static class TradeInfoBuilder {
private boolean isPayoutPublished;
private boolean isWithdrawn;

public TradeInfoBuilder() {
}

public TradeInfoBuilder withOffer(OfferInfo offer) {
this.offer = offer;
return this;
Expand Down