Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crash due to broken filter provided nodes merge #7343

Merged
merged 1 commit into from
Jan 15, 2025
Merged

Fix crash due to broken filter provided nodes merge #7343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions core/src/main/java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -66,9 +67,9 @@ public List<BtcNode> selectPreferredNodes(BtcNodes btcNodes) {
break;
case PROVIDED:
default:
List<BtcNode> hardcodedBtcNodes = btcNodes.getProvidedBtcNodes();
List<String> filterProvidedBtcNodes = config.filterProvidedBtcNodes;
List<String> bannedBtcNodes = config.bannedBtcNodes;
Stream<BtcNode> hardcodedBtcNodes = btcNodes.getProvidedBtcNodes().stream();
Stream<String> filterProvidedBtcNodes = config.filterProvidedBtcNodes.stream();
Stream<String> bannedBtcNodes = config.bannedBtcNodes.stream();
result = FederatedBtcNodeProvider.getNodes(hardcodedBtcNodes, filterProvidedBtcNodes, bannedBtcNodes);
break;
}
Expand Down
18 changes: 9 additions & 9 deletions core/src/main/java/bisq/core/btc/nodes/FederatedBtcNodeProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import lombok.extern.slf4j.Slf4j;

Expand All @@ -14,24 +15,23 @@
@Slf4j
public class FederatedBtcNodeProvider {

static List<BtcNodes.BtcNode> getNodes(List<BtcNodes.BtcNode> hardcodedBtcNodes,
List<String> filterProvidedBtcNodesConfig,
List<String> bannedBtcNodesConfig) {
Set<BtcNodes.BtcNode> filterProvidedBtcNodes = filterProvidedBtcNodesConfig.stream()
static List<BtcNodes.BtcNode> getNodes(Stream<BtcNodes.BtcNode> hardcodedBtcNodes,
Stream<String> filterProvidedBtcNodesConfig,
Stream<String> bannedBtcNodesConfig) {
Stream<BtcNodes.BtcNode> filterProvidedBtcNodes = filterProvidedBtcNodesConfig
.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);
.map(nodeAddress -> new BtcNodes.BtcNode(null, nodeAddress.getHostName(), null,
nodeAddress.getPort(), "Provided by filter"));

Set<NodeAddress> bannedBtcNodeHostNames = bannedBtcNodesConfig.stream()
Set<NodeAddress> bannedBtcNodeHostNames = bannedBtcNodesConfig
.filter(n -> !n.isEmpty())
.map(FederatedBtcNodeProvider::getNodeAddress)
.filter(Objects::nonNull)
.collect(Collectors.toSet());

return hardcodedBtcNodes.stream()
return Stream.concat(hardcodedBtcNodes, filterProvidedBtcNodes)
.filter(btcNode -> {
String nodeAddress = btcNode.hasOnionAddress() ? btcNode.getOnionAddress() :
btcNode.getHostNameOrAddress();
Expand Down
66 changes: 28 additions & 38 deletions core/src/test/java/bisq/core/btc/nodes/FederatedBtcNodeProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package bisq.core.btc.nodes;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Stream;

import org.junit.jupiter.api.Test;

Expand All @@ -20,12 +19,11 @@ void onlyHardcodedNodes() {
BtcNodes.BtcNode.DEFAULT_PORT, "@charlie")
);

List<BtcNodes.BtcNode> mutableHardcodedList = new ArrayList<>(hardcodedNodes);
List<String> filterProvidedBtcNodes = Collections.emptyList();
List<String> bannedBtcNodes = Collections.emptyList();
Stream<String> filterProvidedBtcNodes = Stream.empty();
Stream<String> bannedBtcNodes = Stream.empty();

List<BtcNodes.BtcNode> selectedNodes = FederatedBtcNodeProvider
.getNodes(mutableHardcodedList, filterProvidedBtcNodes, bannedBtcNodes);
.getNodes(hardcodedNodes.stream(), filterProvidedBtcNodes, bannedBtcNodes);

assertIterableEquals(hardcodedNodes, selectedNodes);
}
Expand All @@ -43,13 +41,12 @@ void bannedIpV4Node() {
BtcNodes.BtcNode.DEFAULT_PORT, "@charlie")
);

List<BtcNodes.BtcNode> mutableHardcodedList = new ArrayList<>(hardcodedNodes);
List<String> filterProvidedBtcNodes = Collections.emptyList();
Stream<String> filterProvidedBtcNodes = Stream.empty();
String bannedFullAddress = bannedAddress + ":" + port;
List<String> bannedBtcNodes = List.of(bannedFullAddress);
Stream<String> bannedBtcNodes = Stream.of(bannedFullAddress);

List<BtcNodes.BtcNode> selectedNodes = FederatedBtcNodeProvider
.getNodes(mutableHardcodedList, filterProvidedBtcNodes, bannedBtcNodes);
.getNodes(hardcodedNodes.stream(), filterProvidedBtcNodes, bannedBtcNodes);

var expected = List.of(
new BtcNodes.BtcNode(null, "alice.onion", null,
Expand All @@ -72,13 +69,12 @@ void bannedIpV4NodeWrongPort() {
BtcNodes.BtcNode.DEFAULT_PORT, "@charlie")
);

List<BtcNodes.BtcNode> mutableHardcodedList = new ArrayList<>(hardcodedNodes);
List<String> filterProvidedBtcNodes = Collections.emptyList();
Stream<String> filterProvidedBtcNodes = Stream.empty();
String bannedFullAddress = bannedAddress + ":" + 1234;
List<String> bannedBtcNodes = List.of(bannedFullAddress);
Stream<String> bannedBtcNodes = Stream.of(bannedFullAddress);

List<BtcNodes.BtcNode> selectedNodes = FederatedBtcNodeProvider
.getNodes(mutableHardcodedList, filterProvidedBtcNodes, bannedBtcNodes);
.getNodes(hardcodedNodes.stream(), filterProvidedBtcNodes, bannedBtcNodes);

assertIterableEquals(hardcodedNodes, selectedNodes);
}
Expand All @@ -96,13 +92,12 @@ void bannedIpV6Node() {
BtcNodes.BtcNode.DEFAULT_PORT, "@charlie")
);

List<BtcNodes.BtcNode> mutableHardcodedList = new ArrayList<>(hardcodedNodes);
List<String> filterProvidedBtcNodes = Collections.emptyList();
Stream<String> filterProvidedBtcNodes = Stream.empty();
String bannedFullAddress = "[" + bannedAddress + "]" + ":" + port;
List<String> bannedBtcNodes = List.of(bannedFullAddress);
Stream<String> bannedBtcNodes = Stream.of(bannedFullAddress);

List<BtcNodes.BtcNode> selectedNodes = FederatedBtcNodeProvider
.getNodes(mutableHardcodedList, filterProvidedBtcNodes, bannedBtcNodes);
.getNodes(hardcodedNodes.stream(), filterProvidedBtcNodes, bannedBtcNodes);

var expected = List.of(
new BtcNodes.BtcNode(null, "alice.onion", null,
Expand All @@ -125,13 +120,12 @@ void bannedIpV6NodeWrongPort() {
BtcNodes.BtcNode.DEFAULT_PORT, "@charlie")
);

List<BtcNodes.BtcNode> mutableHardcodedList = new ArrayList<>(hardcodedNodes);
List<String> filterProvidedBtcNodes = Collections.emptyList();
Stream<String> filterProvidedBtcNodes = Stream.empty();
String bannedFullAddress = "[" + bannedAddress + "]" + ":" + 1234;
List<String> bannedBtcNodes = List.of(bannedFullAddress);
Stream<String> bannedBtcNodes = Stream.of(bannedFullAddress);

List<BtcNodes.BtcNode> selectedNodes = FederatedBtcNodeProvider
.getNodes(mutableHardcodedList, filterProvidedBtcNodes, bannedBtcNodes);
.getNodes(hardcodedNodes.stream(), filterProvidedBtcNodes, bannedBtcNodes);

assertIterableEquals(hardcodedNodes, selectedNodes);
}
Expand All @@ -149,12 +143,11 @@ void bannedHostNameNode() {
BtcNodes.BtcNode.DEFAULT_PORT, "@charlie")
);

List<BtcNodes.BtcNode> mutableHardcodedList = new ArrayList<>(hardcodedNodes);
List<String> filterProvidedBtcNodes = Collections.emptyList();
List<String> bannedBtcNodes = List.of(bannedHostName + ":" + port);
Stream<String> filterProvidedBtcNodes = Stream.empty();
Stream<String> bannedBtcNodes = Stream.of(bannedHostName + ":" + port);

List<BtcNodes.BtcNode> selectedNodes = FederatedBtcNodeProvider
.getNodes(mutableHardcodedList, filterProvidedBtcNodes, bannedBtcNodes);
.getNodes(hardcodedNodes.stream(), filterProvidedBtcNodes, bannedBtcNodes);

var expected = List.of(
new BtcNodes.BtcNode(null, "alice.onion", null,
Expand All @@ -177,12 +170,11 @@ void bannedHostNameNodeWrongPort() {
BtcNodes.BtcNode.DEFAULT_PORT, "@charlie")
);

List<BtcNodes.BtcNode> mutableHardcodedList = new ArrayList<>(hardcodedNodes);
List<String> filterProvidedBtcNodes = Collections.emptyList();
List<String> bannedBtcNodes = List.of(bannedHostName + ":" + 1234);
Stream<String> filterProvidedBtcNodes = Stream.empty();
Stream<String> bannedBtcNodes = Stream.of(bannedHostName + ":" + 1234);

List<BtcNodes.BtcNode> selectedNodes = FederatedBtcNodeProvider
.getNodes(mutableHardcodedList, filterProvidedBtcNodes, bannedBtcNodes);
.getNodes(hardcodedNodes.stream(), filterProvidedBtcNodes, bannedBtcNodes);

assertIterableEquals(hardcodedNodes, selectedNodes);
}
Expand All @@ -200,12 +192,11 @@ void bannedOnionNode() {
BtcNodes.BtcNode.DEFAULT_PORT, "@charlie")
);

List<BtcNodes.BtcNode> mutableHardcodedList = new ArrayList<>(hardcodedNodes);
List<String> filterProvidedBtcNodes = Collections.emptyList();
List<String> bannedBtcNodes = List.of(bannedOnionAddress + ":" + BtcNodes.BtcNode.DEFAULT_PORT);
Stream<String> filterProvidedBtcNodes = Stream.empty();
Stream<String> bannedBtcNodes = Stream.of(bannedOnionAddress + ":" + BtcNodes.BtcNode.DEFAULT_PORT);

List<BtcNodes.BtcNode> selectedNodes = FederatedBtcNodeProvider
.getNodes(mutableHardcodedList, filterProvidedBtcNodes, bannedBtcNodes);
.getNodes(hardcodedNodes.stream(), filterProvidedBtcNodes, bannedBtcNodes);

var expected = List.of(
new BtcNodes.BtcNode(null, "alice.onion", null,
Expand All @@ -229,12 +220,11 @@ void bannedOnionNodeWrongPort() {
BtcNodes.BtcNode.DEFAULT_PORT, "@charlie")
);

List<BtcNodes.BtcNode> mutableHardcodedList = new ArrayList<>(hardcodedNodes);
List<String> filterProvidedBtcNodes = Collections.emptyList();
List<String> bannedBtcNodes = List.of(bannedOnionAddress + ":" + 1234);
Stream<String> filterProvidedBtcNodes = Stream.empty();
Stream<String> bannedBtcNodes = Stream.of(bannedOnionAddress + ":" + 1234);

List<BtcNodes.BtcNode> selectedNodes = FederatedBtcNodeProvider
.getNodes(mutableHardcodedList, filterProvidedBtcNodes, bannedBtcNodes);
.getNodes(hardcodedNodes.stream(), filterProvidedBtcNodes, bannedBtcNodes);

assertIterableEquals(hardcodedNodes, selectedNodes);
}
Expand Down
Loading