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

Deactivate open offer if trigger price is reached #5001

Merged
merged 17 commits into from Dec 28, 2020
Merged

Deactivate open offer if trigger price is reached #5001

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b36802d
Add percentage price to open offer view
chimp1984 Dec 23, 2020
d1c8718
Merge branch 'add-percentage-price-to-open-offer-view' into deactivat…
chimp1984 Dec 24, 2020
8ac81d9
Refactor InfoInputTextField
chimp1984 Dec 24, 2020
99192e7
Apply formatting (no code change)
chimp1984 Dec 24, 2020
7529847
Add getRegularIconButton method
chimp1984 Dec 24, 2020
0e6b983
Add triggerPrice
chimp1984 Dec 24, 2020
229d013
Add PriceEventHandler
chimp1984 Dec 24, 2020
e5957cd
Set priceTypeToggleButton invisible once we move to funds section
chimp1984 Dec 24, 2020
bb9de0b
Add trigger price field to create offer view
chimp1984 Dec 25, 2020
f096351
Make rows smaller
chimp1984 Dec 25, 2020
39893a6
Add trigger price to OpenOffersView
chimp1984 Dec 25, 2020
64607de
Add trigger icon column
chimp1984 Dec 25, 2020
2a86d5b
Add triggerPrice to csv
chimp1984 Dec 25, 2020
57c1ad2
Add dontShowAgain to edit offer success popup
chimp1984 Dec 25, 2020
4f96ade
Rename wrong params
chimp1984 Dec 25, 2020
1336cbb
Fix test
chimp1984 Dec 25, 2020
681fed6
Fix log
chimp1984 Dec 28, 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
32 changes: 21 additions & 11 deletions desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java
View file
Open in desktop
Expand Up @@ -17,6 +17,8 @@

package bisq.desktop.main.offer.offerbook;

import bisq.desktop.main.PriceUtil;

import bisq.core.locale.Country;
import bisq.core.locale.CryptoCurrency;
import bisq.core.locale.FiatCurrency;
Expand All @@ -41,6 +43,7 @@
import bisq.core.payment.payload.SpecificBanksAccountPayload;
import bisq.core.provider.price.MarketPrice;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.trade.statistics.TradeStatisticsManager;
import bisq.core.util.coin.BsqFormatter;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.coin.ImmutableCoinFormatter;
Expand Down Expand Up @@ -90,6 +93,13 @@ public void setUp() {
Res.setBaseCurrencyName(usd.getName());
}

private PriceUtil getPriceUtil() {
PriceFeedService priceFeedService = mock(PriceFeedService.class);
TradeStatisticsManager tradeStatisticsManager = mock(TradeStatisticsManager.class);
when(tradeStatisticsManager.getObservableTradeStatisticsSet()).thenReturn(FXCollections.observableSet());
return new PriceUtil(priceFeedService, tradeStatisticsManager, empty);
}

@Ignore("PaymentAccountPayload needs to be set (has been changed with PB changes)")
public void testIsAnyPaymentAccountValidForOffer() {
Collection<PaymentAccount> paymentAccounts;
Expand Down Expand Up @@ -229,7 +239,7 @@ public void testMaxCharactersForAmountWithNoOffes() {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookViewModel model = new OfferBookViewModel(null, null, offerBook, empty, null, null, null,
null, null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, getPriceUtil(), coinFormatter, new BsqFormatter());
assertEquals(0, model.maxPlacesForAmount.intValue());
}

Expand All @@ -243,7 +253,7 @@ public void testMaxCharactersForAmount() {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookViewModel model = new OfferBookViewModel(null, openOfferManager, offerBook, empty, null, null, null,
null, null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, getPriceUtil(), coinFormatter, new BsqFormatter());
model.activate();

assertEquals(6, model.maxPlacesForAmount.intValue());
Expand All @@ -261,7 +271,7 @@ public void testMaxCharactersForAmountRange() {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookViewModel model = new OfferBookViewModel(null, openOfferManager, offerBook, empty, null, null, null,
null, null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, getPriceUtil(), coinFormatter, new BsqFormatter());
model.activate();

assertEquals(15, model.maxPlacesForAmount.intValue());
Expand All @@ -280,7 +290,7 @@ public void testMaxCharactersForVolumeWithNoOffes() {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookViewModel model = new OfferBookViewModel(null, null, offerBook, empty, null, null, null,
null, null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, getPriceUtil(), coinFormatter, new BsqFormatter());
assertEquals(0, model.maxPlacesForVolume.intValue());
}

Expand All @@ -294,7 +304,7 @@ public void testMaxCharactersForVolume() {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookViewModel model = new OfferBookViewModel(null, openOfferManager, offerBook, empty, null, null, null,
null, null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, getPriceUtil(), coinFormatter, new BsqFormatter());
model.activate();

assertEquals(5, model.maxPlacesForVolume.intValue());
Expand All @@ -312,7 +322,7 @@ public void testMaxCharactersForVolumeRange() {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookViewModel model = new OfferBookViewModel(null, openOfferManager, offerBook, empty, null, null, null,
null, null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, getPriceUtil(), coinFormatter, new BsqFormatter());
model.activate();

assertEquals(9, model.maxPlacesForVolume.intValue());
Expand All @@ -331,7 +341,7 @@ public void testMaxCharactersForPriceWithNoOffers() {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookViewModel model = new OfferBookViewModel(null, null, offerBook, empty, null, null, null,
null, null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, getPriceUtil(), coinFormatter, new BsqFormatter());
assertEquals(0, model.maxPlacesForPrice.intValue());
}

Expand All @@ -345,7 +355,7 @@ public void testMaxCharactersForPrice() {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookViewModel model = new OfferBookViewModel(null, openOfferManager, offerBook, empty, null, null, null,
null, null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, getPriceUtil(), coinFormatter, new BsqFormatter());
model.activate();

assertEquals(7, model.maxPlacesForPrice.intValue());
Expand All @@ -363,7 +373,7 @@ public void testMaxCharactersForPriceDistanceWithNoOffers() {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookViewModel model = new OfferBookViewModel(null, null, offerBook, empty, null, null, null,
null, null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, getPriceUtil(), coinFormatter, new BsqFormatter());
assertEquals(0, model.maxPlacesForMarketPriceMargin.intValue());
}

Expand Down Expand Up @@ -391,7 +401,7 @@ public void testMaxCharactersForPriceDistance() {
offerBookListItems.addAll(item1, item2);

final OfferBookViewModel model = new OfferBookViewModel(null, openOfferManager, offerBook, empty, null, null, priceFeedService,
null, null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, getPriceUtil(), coinFormatter, new BsqFormatter());
model.activate();

assertEquals(8, model.maxPlacesForMarketPriceMargin.intValue()); //" (1.97%)"
Expand All @@ -412,7 +422,7 @@ public void testGetPrice() {
when(priceFeedService.getMarketPrice(anyString())).thenReturn(new MarketPrice("USD", 12684.0450, Instant.now().getEpochSecond(), true));

final OfferBookViewModel model = new OfferBookViewModel(null, openOfferManager, offerBook, empty, null, null, null,
null, null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, getPriceUtil(), coinFormatter, new BsqFormatter());

final OfferBookListItem item = make(btcBuyItem.but(
with(useMarketBasedPrice, true),
Expand Down