Merge pull request #1722 from djing-chan/cleanup-settings

Remove unused markets field in SettingsStore
bisq-network · Feb 29, 2024 · d9a0a70 · d9a0a70
2 parents de53ca4 + 1eef4ee
commit d9a0a70
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 26 deletions.
diff --git a/settings/src/main/java/bisq/settings/SettingsService.java b/settings/src/main/java/bisq/settings/SettingsService.java
@@ -71,7 +71,6 @@ public CompletableFuture<Boolean> initialize() {
         getMinRequiredReputationScore().addObserver(value -> persist());
         getCloseMyOfferWhenTaken().addObserver(value -> persist());
         getSupportedLanguageCodes().addObserver(this::persist);
-        getMarkets().addObserver(this::persist);
         getSelectedMarket().addObserver(value -> persist());
         getTradeRulesConfirmed().addObserver(value -> persist());
         getSupportedLanguageCodes().addObserver(this::persist);
@@ -113,10 +112,6 @@ public void onPersistedApplied(SettingsStore persisted) {
         Res.setLanguage(getLanguageCode());
     }
 
-    public ObservableSet<Market> getMarkets() {
-        return persistableStore.markets;
-    }
-
     public Observable<Market> getSelectedMarket() {
         return persistableStore.selectedMarket;
     }

diff --git a/settings/src/main/java/bisq/settings/SettingsStore.java b/settings/src/main/java/bisq/settings/SettingsStore.java
@@ -37,7 +37,6 @@ public final class SettingsStore implements PersistableStore<SettingsStore> {
     final Cookie cookie;
     final Map<String, Boolean> dontShowAgainMap = new ConcurrentHashMap<>();
     final Observable<Boolean> useAnimations = new Observable<>();
-    final ObservableSet<Market> markets = new ObservableSet<>();
     final Observable<Market> selectedMarket = new Observable<>();
     final Observable<Long> minRequiredReputationScore = new Observable<>();
     final Observable<Boolean> offersOnly = new Observable<>();
@@ -54,7 +53,6 @@ public SettingsStore() {
         this(new Cookie(),
                 new HashMap<>(),
                 true,
-                new HashSet<>(MarketRepository.getAllFiatMarkets()),
                 MarketRepository.getDefault(),
                 SettingsService.DEFAULT_MIN_REQUIRED_REPUTATION_SCORE,
                 false,
@@ -71,7 +69,6 @@ public SettingsStore() {
     public SettingsStore(Cookie cookie,
                          Map<String, Boolean> dontShowAgainMap,
                          boolean useAnimations,
-                         Set<Market> markets,
                          Market selectedMarket,
                          long requiredTotalReputationScore,
                          boolean offersOnly,
@@ -86,7 +83,6 @@ public SettingsStore(Cookie cookie,
         this.cookie = cookie;
         this.dontShowAgainMap.putAll(dontShowAgainMap);
         this.useAnimations.set(useAnimations);
-        this.markets.setAll(markets);
         this.selectedMarket.set(selectedMarket);
         this.minRequiredReputationScore.set(requiredTotalReputationScore);
         this.offersOnly.set(offersOnly);
@@ -106,7 +102,6 @@ public bisq.settings.protobuf.SettingsStore toProto() {
                 .setCookie(cookie.toProto())
                 .putAllDontShowAgainMap(dontShowAgainMap)
                 .setUseAnimations(useAnimations.get())
-                .addAllMarkets(markets.stream().map(Market::toProto).collect(Collectors.toList()))
                 .setSelectedMarket(selectedMarket.get().toProto())
                 .setMinRequiredReputationScore(minRequiredReputationScore.get())
                 .setOffersOnly(offersOnly.get())
@@ -126,7 +121,6 @@ public static SettingsStore fromProto(bisq.settings.protobuf.SettingsStore proto
                 proto.getDontShowAgainMapMap().entrySet().stream()
                         .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)),
                 proto.getUseAnimations(),
-                new ObservableSet<>(proto.getMarketsList().stream().map(Market::fromProto).collect(Collectors.toList())),
                 Market.fromProto(proto.getSelectedMarket()),
                 proto.getMinRequiredReputationScore(),
                 proto.getOffersOnly(),
@@ -156,7 +150,6 @@ public SettingsStore getClone() {
         return new SettingsStore(cookie,
                 dontShowAgainMap,
                 useAnimations.get(),
-                markets,
                 selectedMarket.get(),
                 minRequiredReputationScore.get(),
                 offersOnly.get(),
@@ -176,8 +169,6 @@ public void applyPersisted(SettingsStore persisted) {
             cookie.putAll(persisted.cookie.getMap());
             dontShowAgainMap.putAll(persisted.dontShowAgainMap);
             useAnimations.set(persisted.useAnimations.get());
-            markets.clear();
-            markets.addAll(persisted.markets);
             selectedMarket.set(persisted.selectedMarket.get());
             minRequiredReputationScore.set(persisted.minRequiredReputationScore.get());
             offersOnly.set(persisted.offersOnly.get());

diff --git a/settings/src/main/proto/settings.proto b/settings/src/main/proto/settings.proto
@@ -41,16 +41,15 @@ message SettingsStore {
   Cookie cookie = 1;
   map<string, bool> dontShowAgainMap = 2;
   bool useAnimations = 3;
-  repeated common.Market markets = 4;
-  common.Market selectedMarket = 5;
-  sint64 minRequiredReputationScore = 6;
-  bool offersOnly = 7;
-  bool tradeRulesConfirmed = 8;
-  ChatNotificationType chatNotificationType = 9;
-  bool isTacAccepted = 10;
-  repeated string consumedAlertIds = 11;
-  bool closeMyOfferWhenTaken = 12;
-  string languageCode = 13;
-  bool preventStandbyMode = 14;
-  repeated string supportedLanguageCodes = 15;
+  common.Market selectedMarket = 4;
+  sint64 minRequiredReputationScore = 5;
+  bool offersOnly = 6;
+  bool tradeRulesConfirmed = 7;
+  ChatNotificationType chatNotificationType = 8;
+  bool isTacAccepted = 9;
+  repeated string consumedAlertIds = 10;
+  bool closeMyOfferWhenTaken = 11;
+  string languageCode = 12;
+  bool preventStandbyMode = 13;
+  repeated string supportedLanguageCodes = 14;
 }