From 6a9b2839a3fc037f2c4de1883e692e35a42c56f1 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 10 May 2018 21:29:50 +0200 Subject: [PATCH] Remove STRESS_TEST_MODE flag --- src/main/java/bisq/desktop/main/MainView.java | 13 ++++--------- src/main/java/bisq/desktop/main/MainViewModel.java | 2 +- .../desktop/main/offer/offerbook/OfferBook.java | 10 +--------- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/main/java/bisq/desktop/main/MainView.java b/src/main/java/bisq/desktop/main/MainView.java index b50de56dd9..386fa19e8f 100644 --- a/src/main/java/bisq/desktop/main/MainView.java +++ b/src/main/java/bisq/desktop/main/MainView.java @@ -47,7 +47,6 @@ import bisq.core.locale.Res; import bisq.common.Timer; import bisq.common.UserThread; -import bisq.common.app.DevEnv; import bisq.common.app.Version; import bisq.common.util.Tuple2; import bisq.common.util.Utilities; @@ -103,26 +102,22 @@ public class MainView extends InitializableView { @SuppressWarnings("PointlessBooleanExpression") public static void blur() { - if (!DevEnv.STRESS_TEST_MODE) - transitions.blur(MainView.rootContainer); + transitions.blur(MainView.rootContainer); } @SuppressWarnings("PointlessBooleanExpression") public static void blurLight() { - if (!DevEnv.STRESS_TEST_MODE) - transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.1, false, 5); + transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.1, false, 5); } @SuppressWarnings("PointlessBooleanExpression") public static void blurUltraLight() { - if (!DevEnv.STRESS_TEST_MODE) - transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.1, false, 2); + transitions.blur(MainView.rootContainer, Transitions.DEFAULT_DURATION, -0.1, false, 2); } @SuppressWarnings("PointlessBooleanExpression") public static void darken() { - if (!DevEnv.STRESS_TEST_MODE) - transitions.darken(MainView.rootContainer, Transitions.DEFAULT_DURATION, false); + transitions.darken(MainView.rootContainer, Transitions.DEFAULT_DURATION, false); } public static void removeEffect() { diff --git a/src/main/java/bisq/desktop/main/MainViewModel.java b/src/main/java/bisq/desktop/main/MainViewModel.java index 29b157c49e..6c43fd513f 100644 --- a/src/main/java/bisq/desktop/main/MainViewModel.java +++ b/src/main/java/bisq/desktop/main/MainViewModel.java @@ -181,7 +181,7 @@ public class MainViewModel implements ViewModel { // BTC network final StringProperty btcInfo = new SimpleStringProperty(Res.get("mainView.footer.btcInfo.initializing")); @SuppressWarnings("ConstantConditions") - final DoubleProperty btcSyncProgress = new SimpleDoubleProperty(DevEnv.STRESS_TEST_MODE ? 0 : -1); + final DoubleProperty btcSyncProgress = new SimpleDoubleProperty(-1); final StringProperty walletServiceErrorMsg = new SimpleStringProperty(); final StringProperty btcSplashSyncIconId = new SimpleStringProperty(); private final StringProperty marketPriceCurrencyCode = new SimpleStringProperty(""); diff --git a/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java b/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java index 1aa16f3f27..d975419359 100644 --- a/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java +++ b/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java @@ -21,8 +21,6 @@ import bisq.core.offer.Offer; import bisq.core.offer.OfferBookService; import bisq.core.trade.TradeManager; -import bisq.common.app.Log; - import javax.inject.Inject; import javafx.collections.FXCollections; @@ -81,7 +79,6 @@ public class OfferBook { } offerBookListItems.add(offerBookListItem); - Log.logIfStressTests("OfferPayload added: No. of offers = " + offerBookListItems.size()); } else { log.debug("We have the exact same offer already in our list and ignore the onAdded call. ID={}", offer.getId()); } @@ -98,10 +95,7 @@ public class OfferBook { Optional candidateToRemove = offerBookListItems.stream() .filter(item -> item.getOffer().getId().equals(offer.getId())) .findAny(); - if (candidateToRemove.isPresent()) { - offerBookListItems.remove(candidateToRemove.get()); - Log.logIfStressTests("OfferPayload removed: No. of offers = " + offerBookListItems.size()); - } + candidateToRemove.ifPresent(offerBookListItems::remove); } }); } @@ -119,8 +113,6 @@ public class OfferBook { .map(OfferBookListItem::new) .collect(Collectors.toList())); - Log.logIfStressTests("OfferPayload filled: No. of offers = " + offerBookListItems.size()); - log.debug("offerBookListItems.size " + offerBookListItems.size()); fillOfferCountMaps(); } catch (Throwable t) {