mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-01 01:32:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Pass filterProvidedBtcNodes and bannedBtcNodes to FederatedBtcNodeProvider

Browse source
This commit is contained in:
Alva Swanson 2024-11-18 22:13:01 +00:00 • committed by Alejandro García
parent 8be563f71e
commit 7a683ce52e
No known key found for this signature in database
GPG key ID: F806F422E222AA02
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java
View file

@ -67,7 +67,9 @@ public class BtcNodesSetupPreferences {
case PROVIDED: case PROVIDED:
default: default:
List<BtcNode> hardcodedBtcNodes = btcNodes.getProvidedBtcNodes(); 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; break;
} }

10
core/src/main/java/bisq/core/btc/nodes/FederatedBtcNodeProvider.java
View file

@ -2,8 +2,6 @@ package bisq.core.btc.nodes;
import bisq.network.p2p.NodeAddress; import bisq.network.p2p.NodeAddress;
import bisq.common.config.Config;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
@ -16,8 +14,10 @@ import org.jetbrains.annotations.Nullable;
@Slf4j @Slf4j
public class FederatedBtcNodeProvider { public class FederatedBtcNodeProvider {
static List<BtcNodes.BtcNode> getNodes(List<BtcNodes.BtcNode> hardcodedBtcNodes, Config config) { static List<BtcNodes.BtcNode> getNodes(List<BtcNodes.BtcNode> hardcodedBtcNodes,
Set<BtcNodes.BtcNode> filterProvidedBtcNodes = config.filterProvidedBtcNodes.stream() List<String> filterProvidedBtcNodesConfig,
List<String> bannedBtcNodesConfig) {
Set<BtcNodes.BtcNode> filterProvidedBtcNodes = filterProvidedBtcNodesConfig.stream()
.filter(n -> !n.isEmpty()) .filter(n -> !n.isEmpty())
.map(FederatedBtcNodeProvider::getNodeAddress) .map(FederatedBtcNodeProvider::getNodeAddress)
.filter(Objects::nonNull) .filter(Objects::nonNull)
@ -25,7 +25,7 @@ public class FederatedBtcNodeProvider {
.collect(Collectors.toSet()); .collect(Collectors.toSet());
hardcodedBtcNodes.addAll(filterProvidedBtcNodes); hardcodedBtcNodes.addAll(filterProvidedBtcNodes);
Set<String> bannedBtcNodeHostNames = config.bannedBtcNodes.stream() Set<String> bannedBtcNodeHostNames = bannedBtcNodesConfig.stream()
.filter(n -> !n.isEmpty()) .filter(n -> !n.isEmpty())
.map(FederatedBtcNodeProvider::getNodeAddress) .map(FederatedBtcNodeProvider::getNodeAddress)
.filter(Objects::nonNull) .filter(Objects::nonNull)