Refactor: Rename ProvidersRepository to PriceFeedNodeAddressProvider

Signed-off-by: HenrikJannsen <[email protected]>
HenrikJannsen · Jul 26, 2024 · f1796e5 · f1796e5
1 parent 11ac408
commit f1796e5
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 30 deletions.
diff --git a/core/src/main/java/bisq/core/btc/BitcoinModule.java b/core/src/main/java/bisq/core/btc/BitcoinModule.java
@@ -26,7 +26,7 @@
 import bisq.core.btc.wallet.BtcWalletService;
 import bisq.core.btc.wallet.NonBsqCoinSelector;
 import bisq.core.btc.wallet.TradeWalletService;
-import bisq.core.provider.ProvidersRepository;
+import bisq.core.provider.PriceFeedNodeAddressProvider;
 import bisq.core.provider.fee.FeeService;
 import bisq.core.provider.price.PriceFeedService;
 
@@ -93,7 +93,7 @@ protected void configure() {
         bind(BtcNodes.class).in(Singleton.class);
         bind(Balances.class).in(Singleton.class);
 
-        bind(ProvidersRepository.class).in(Singleton.class);
+        bind(PriceFeedNodeAddressProvider.class).in(Singleton.class);
         bind(PriceFeedService.class).in(Singleton.class);
         bind(FeeService.class).in(Singleton.class);
         bind(TxFeeEstimationService.class).in(Singleton.class);

diff --git a/core/src/main/java/bisq/core/filter/FilterManager.java b/core/src/main/java/bisq/core/filter/FilterManager.java
@@ -22,7 +22,7 @@
 import bisq.core.offer.Offer;
 import bisq.core.payment.payload.PaymentAccountPayload;
 import bisq.core.payment.payload.PaymentMethod;
-import bisq.core.provider.ProvidersRepository;
+import bisq.core.provider.PriceFeedNodeAddressProvider;
 import bisq.core.user.Preferences;
 import bisq.core.user.User;
 
@@ -101,7 +101,7 @@ public interface Listener {
     private final User user;
     private final Preferences preferences;
     private final ConfigFileEditor configFileEditor;
-    private final ProvidersRepository providersRepository;
+    private final PriceFeedNodeAddressProvider priceFeedNodeAddressProvider;
     private final boolean ignoreDevMsg;
     private final ObjectProperty<Filter> filterProperty = new SimpleObjectProperty<>();
     private final List<Listener> listeners = new CopyOnWriteArrayList<>();
@@ -121,7 +121,7 @@ public FilterManager(P2PService p2PService,
                          User user,
                          Preferences preferences,
                          Config config,
-                         ProvidersRepository providersRepository,
+                         PriceFeedNodeAddressProvider priceFeedNodeAddressProvider,
                          BanFilter banFilter,
                          @Named(Config.IGNORE_DEV_MSG) boolean ignoreDevMsg,
                          @Named(Config.USE_DEV_PRIVILEGE_KEYS) boolean useDevPrivilegeKeys) {
@@ -130,7 +130,7 @@ public FilterManager(P2PService p2PService,
         this.user = user;
         this.preferences = preferences;
         this.configFileEditor = new ConfigFileEditor(config.getConfigFile());
-        this.providersRepository = providersRepository;
+        this.priceFeedNodeAddressProvider = priceFeedNodeAddressProvider;
         this.ignoreDevMsg = ignoreDevMsg;
 
         publicKeys = useDevPrivilegeKeys ?
@@ -583,7 +583,7 @@ private void onFilterAddedFromNetwork(Filter filterFromNetwork) {
         saveBannedNodes(BANNED_PRICE_RELAY_NODES, priceRelayNodes);
 
         //TODO should be moved to client with listening on onFilterAdded
-        providersRepository.applyBannedNodes(priceRelayNodes);
+        priceFeedNodeAddressProvider.applyBannedNodes(priceRelayNodes);
 
         //TODO should be moved to client with listening on onFilterAdded
         if (filterFromNetwork.isPreventPublicBtcNetwork() &&
@@ -626,8 +626,8 @@ private void clearBannedNodes() {
         saveBannedNodes(FILTER_PROVIDED_SEED_NODES, null);
         saveBannedNodes(BANNED_PRICE_RELAY_NODES, null);
 
-        if (providersRepository.getBannedNodes() != null) {
-            providersRepository.applyBannedNodes(null);
+        if (priceFeedNodeAddressProvider.getBannedNodes() != null) {
+            priceFeedNodeAddressProvider.applyBannedNodes(null);
         }
     }
 

diff --git a/...sq/core/provider/ProvidersRepository.java → ...rovider/PriceFeedNodeAddressProvider.java b/...sq/core/provider/ProvidersRepository.java → ...rovider/PriceFeedNodeAddressProvider.java
@@ -34,7 +34,7 @@
 import javax.annotation.Nullable;
 
 @Slf4j
-public class ProvidersRepository {
+public class PriceFeedNodeAddressProvider {
     public static final List<String> DEFAULT_NODES = Arrays.asList(
             "http://ro7nv73awqs3ga2qtqeqawrjpbxwarsazznszvr6whv7tes5ehffopid.onion/", // @alexej996
             "http://runbtcpn7gmbj5rgqeyfyvepqokrijem6rbw7o5wgqbguimuoxrmcdyd.onion"   // @runbtc
@@ -58,9 +58,9 @@ public class ProvidersRepository {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public ProvidersRepository(Config config,
-                               @Named(Config.PROVIDERS) List<String> providers,
-                               @Named(Config.USE_LOCALHOST_FOR_P2P) boolean useLocalhostForP2P) {
+    public PriceFeedNodeAddressProvider(Config config,
+                                        @Named(Config.PROVIDERS) List<String> providers,
+                                        @Named(Config.USE_LOCALHOST_FOR_P2P) boolean useLocalhostForP2P) {
 
         this.config = config;
         this.providersFromProgramArgs = providers;

diff --git a/core/src/main/java/bisq/core/provider/price/PriceFeedService.java b/core/src/main/java/bisq/core/provider/price/PriceFeedService.java
@@ -21,8 +21,8 @@
 import bisq.core.locale.TradeCurrency;
 import bisq.core.monetary.Altcoin;
 import bisq.core.monetary.Price;
+import bisq.core.provider.PriceFeedNodeAddressProvider;
 import bisq.core.provider.PriceHttpClient;
-import bisq.core.provider.ProvidersRepository;
 import bisq.core.provider.fee.FeeService;
 import bisq.core.user.Preferences;
 
@@ -66,7 +66,7 @@
 @Slf4j
 public class PriceFeedService {
     private final HttpClient httpClient;
-    private final ProvidersRepository providersRepository;
+    private final PriceFeedNodeAddressProvider priceFeedNodeAddressProvider;
     private final Preferences preferences;
     private final FeeService feeService;
 
@@ -101,15 +101,15 @@ public class PriceFeedService {
     @Inject
     public PriceFeedService(PriceHttpClient httpClient,
                             FeeService feeService,
-                            @SuppressWarnings("SameParameterValue") ProvidersRepository providersRepository,
+                            @SuppressWarnings("SameParameterValue") PriceFeedNodeAddressProvider priceFeedNodeAddressProvider,
                             @SuppressWarnings("SameParameterValue") Preferences preferences) {
         this.httpClient = httpClient;
-        this.providersRepository = providersRepository;
+        this.priceFeedNodeAddressProvider = priceFeedNodeAddressProvider;
         this.preferences = preferences;
         this.feeService = feeService;
 
         // Do not use Guice for PriceProvider as we might create multiple instances
-        this.priceProvider = new PriceProvider(httpClient, providersRepository.getBaseUrl());
+        this.priceProvider = new PriceProvider(httpClient, priceFeedNodeAddressProvider.getBaseUrl());
     }
 
 
@@ -161,10 +161,10 @@ public String getProviderNodeAddress() {
     private void request(boolean repeatRequests) {
         if (requestTs == 0)
             log.debug("request from provider {}",
-                    providersRepository.getBaseUrl());
+                    priceFeedNodeAddressProvider.getBaseUrl());
         else
             log.debug("request from provider {} {} sec. after last request",
-                    providersRepository.getBaseUrl(),
+                    priceFeedNodeAddressProvider.getBaseUrl(),
                     (System.currentTimeMillis() - requestTs) / 1000d);
 
         requestTs = System.currentTimeMillis();
@@ -256,9 +256,9 @@ private void retryWithNewProvider() {
     }
 
     private void setNewPriceProvider() {
-        providersRepository.selectNextProviderBaseUrl();
-        if (!providersRepository.getBaseUrl().isEmpty())
-            priceProvider = new PriceProvider(httpClient, providersRepository.getBaseUrl());
+        priceFeedNodeAddressProvider.selectNextProviderBaseUrl();
+        if (!priceFeedNodeAddressProvider.getBaseUrl().isEmpty())
+            priceProvider = new PriceProvider(httpClient, priceFeedNodeAddressProvider.getBaseUrl());
         else
             log.warn("We cannot create a new priceProvider because new base url is empty.");
     }

diff --git a/core/src/test/java/bisq/core/filter/FilterManagerAddFilterToNetworkTests.java b/core/src/test/java/bisq/core/filter/FilterManagerAddFilterToNetworkTests.java
@@ -17,7 +17,7 @@
 
 package bisq.core.filter;
 
-import bisq.core.provider.ProvidersRepository;
+import bisq.core.provider.PriceFeedNodeAddressProvider;
 import bisq.core.user.Preferences;
 import bisq.core.user.User;
 
@@ -106,7 +106,7 @@ void beforeEach(@TempDir Path tmpDir, @Mock P2PService p2PService, @Mock P2PData
                 mock(User.class),
                 mock(Preferences.class),
                 config,
-                mock(ProvidersRepository.class),
+                mock(PriceFeedNodeAddressProvider.class),
                 mock(BanFilter.class),
                 false,
                 true

diff --git a/core/src/test/java/bisq/core/filter/FilterManagerInitializationTests.java b/core/src/test/java/bisq/core/filter/FilterManagerInitializationTests.java
@@ -18,7 +18,7 @@
 package bisq.core.filter;
 
 import bisq.core.locale.Res;
-import bisq.core.provider.ProvidersRepository;
+import bisq.core.provider.PriceFeedNodeAddressProvider;
 import bisq.core.user.Preferences;
 import bisq.core.user.User;
 
@@ -61,7 +61,7 @@ void onAllServicesInitializedNoFilterMainnet() {
                 mock(User.class),
                 mock(Preferences.class),
                 mock(Config.class),
-                mock(ProvidersRepository.class),
+                mock(PriceFeedNodeAddressProvider.class),
                 mock(BanFilter.class),
                 false,
                 true
@@ -99,7 +99,7 @@ void onAllServicesInitializedNoFilterMainnetIgnoreDevMsg() {
                 mock(User.class),
                 mock(Preferences.class),
                 mock(Config.class),
-                mock(ProvidersRepository.class),
+                mock(PriceFeedNodeAddressProvider.class),
                 mock(BanFilter.class),
                 true,
                 true

diff --git a/core/src/test/java/bisq/core/filter/FilterManagerMockedPrivilegeKeysTests.java b/core/src/test/java/bisq/core/filter/FilterManagerMockedPrivilegeKeysTests.java
@@ -17,7 +17,7 @@
 
 package bisq.core.filter;
 
-import bisq.core.provider.ProvidersRepository;
+import bisq.core.provider.PriceFeedNodeAddressProvider;
 import bisq.core.user.Preferences;
 import bisq.core.user.User;
 
@@ -109,7 +109,7 @@ void testBannedPrivilegedDevKey(@TempDir Path tmpDir,
                     mock(User.class),
                     mock(Preferences.class),
                     config,
-                    mock(ProvidersRepository.class),
+                    mock(PriceFeedNodeAddressProvider.class),
                     mock(BanFilter.class),
                     false,
                     true