Pass filterProvidedBtcNodes and bannedBtcNodes to FederatedBtcNodePro…

…vider
bisq-network · Nov 18, 2024 · c4e82d5 · c4e82d5
1 parent bc6954e
commit c4e82d5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/core/src/main/java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java b/core/src/main/java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java
@@ -67,7 +67,9 @@ public List<BtcNode> selectPreferredNodes(BtcNodes btcNodes) {
             case PROVIDED:
             default:
                 List<BtcNode> hardcodedBtcNodes = btcNodes.getProvidedBtcNodes();
-                result = FederatedBtcNodeProvider.getNodes(hardcodedBtcNodes, config);
+                List<String> filterProvidedBtcNodes = config.filterProvidedBtcNodes;
+                List<String> bannedBtcNodes = config.bannedBtcNodes;
+                result = FederatedBtcNodeProvider.getNodes(hardcodedBtcNodes, filterProvidedBtcNodes, bannedBtcNodes);
                 break;
         }
 

diff --git a/core/src/main/java/bisq/core/btc/nodes/FederatedBtcNodeProvider.java b/core/src/main/java/bisq/core/btc/nodes/FederatedBtcNodeProvider.java
@@ -2,8 +2,6 @@
 
 import bisq.network.p2p.NodeAddress;
 
-import bisq.common.config.Config;
-
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -16,16 +14,18 @@
 @Slf4j
 public class FederatedBtcNodeProvider {
 
-    static List<BtcNodes.BtcNode> getNodes(List<BtcNodes.BtcNode> hardcodedBtcNodes, Config config) {
-        Set<BtcNodes.BtcNode> filterProvidedBtcNodes = config.filterProvidedBtcNodes.stream()
+    static List<BtcNodes.BtcNode> getNodes(List<BtcNodes.BtcNode> hardcodedBtcNodes,
+                                           List<String> filterProvidedBtcNodesConfig,
+                                           List<String> bannedBtcNodesConfig) {
+        Set<BtcNodes.BtcNode> filterProvidedBtcNodes = filterProvidedBtcNodesConfig.stream()
                 .filter(n -> !n.isEmpty())
                 .map(FederatedBtcNodeProvider::getNodeAddress)
                 .filter(Objects::nonNull)
                 .map(nodeAddress -> new BtcNodes.BtcNode(null, nodeAddress.getHostName(), null, nodeAddress.getPort(), "Provided by filter"))
                 .collect(Collectors.toSet());
         hardcodedBtcNodes.addAll(filterProvidedBtcNodes);
 
-        Set<String> bannedBtcNodeHostNames = config.bannedBtcNodes.stream()
+        Set<String> bannedBtcNodeHostNames = bannedBtcNodesConfig.stream()
                 .filter(n -> !n.isEmpty())
                 .map(FederatedBtcNodeProvider::getNodeAddress)
                 .filter(Objects::nonNull)