From fe72abe8fcbba35ac836c41f36bf120ed3dc5ced Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 4 Dec 2022 13:26:45 +0100 Subject: [PATCH] SeedPeers: don't throw in getPeers() if service bit filtering is used This brings SeedPeers more in line with the other peer discoveries. There is no guarantee for filtering. --- .../java/org/bitcoinj/net/discovery/SeedPeers.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/bitcoinj/net/discovery/SeedPeers.java b/core/src/main/java/org/bitcoinj/net/discovery/SeedPeers.java index 8cc9e5625..9eb4b7787 100644 --- a/core/src/main/java/org/bitcoinj/net/discovery/SeedPeers.java +++ b/core/src/main/java/org/bitcoinj/net/discovery/SeedPeers.java @@ -18,6 +18,8 @@ package org.bitcoinj.net.discovery; import org.bitcoinj.base.utils.ByteUtils; import org.bitcoinj.core.NetworkParameters; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.annotation.Nullable; import java.net.InetAddress; @@ -37,6 +39,8 @@ public class SeedPeers implements PeerDiscovery { private int[] seedAddrs; private int pnseedIndex; + private static final Logger log = LoggerFactory.getLogger(SeedPeers.class); + /** * Supports finding peers by IP addresses * @@ -85,11 +89,16 @@ public class SeedPeers implements PeerDiscovery { /** * Returns all the Bitcoin nodes within the list. + * + * @param services ignored + * @param timeoutValue ignored + * @param timeoutUnit ignored + * @return the pre-determined list of peers */ @Override public List getPeers(long services, long timeoutValue, TimeUnit timeoutUnit) throws PeerDiscoveryException { if (services != 0) - throw new PeerDiscoveryException("Pre-determined peers cannot be filtered by services: " + services); + log.info("Pre-determined peers cannot be filtered by services: {}", services); try { return allPeers(); } catch (UnknownHostException e) {