diff --git a/core/src/main/java/org/bitcoinj/net/discovery/DnsDiscovery.java b/core/src/main/java/org/bitcoinj/net/discovery/DnsDiscovery.java index 808538d0a98..3d1c4f34ca2 100644 --- a/core/src/main/java/org/bitcoinj/net/discovery/DnsDiscovery.java +++ b/core/src/main/java/org/bitcoinj/net/discovery/DnsDiscovery.java @@ -67,23 +67,6 @@ public DnsDiscovery(String[] dnsSeeds, Network network) { super(network, buildDiscoveries(network, dnsSeeds)); } - /** - * @deprecated Use {@link DnsDiscovery#DnsDiscovery(Network)} - */ - @Deprecated - public DnsDiscovery(NetworkParameters netParams) { - this(netParams.getDnsSeeds(), netParams.network()); - } - - /** - * @deprecated Use {@link DnsDiscovery#DnsDiscovery(String[], Network)} - */ - @Deprecated - public DnsDiscovery(String[] dnsSeeds, NetworkParameters params) { - this(dnsSeeds, params.network()); - } - - private static List buildDiscoveries(Network network, String[] seeds) { List discoveries = new ArrayList<>(); if (seeds != null) @@ -107,14 +90,6 @@ public DnsSeedDiscovery(Network network, String hostname) { this.params = NetworkParameters.of(network); } - /** - * @deprecated Use {@link DnsSeedDiscovery#DnsSeedDiscovery(Network, String)} - */ - @Deprecated - public DnsSeedDiscovery(NetworkParameters params, String hostname) { - this(params.network(), hostname); - } - @Override public List getPeers(long services, Duration timeout) throws PeerDiscoveryException { InetAddress[] response = null; diff --git a/core/src/main/java/org/bitcoinj/net/discovery/MultiplexingDiscovery.java b/core/src/main/java/org/bitcoinj/net/discovery/MultiplexingDiscovery.java index 185cb226479..851f5859164 100644 --- a/core/src/main/java/org/bitcoinj/net/discovery/MultiplexingDiscovery.java +++ b/core/src/main/java/org/bitcoinj/net/discovery/MultiplexingDiscovery.java @@ -51,8 +51,6 @@ public class MultiplexingDiscovery implements PeerDiscovery { private static final Logger log = LoggerFactory.getLogger(MultiplexingDiscovery.class); protected final List seeds; - @Deprecated - protected final NetworkParameters netParams; private volatile ExecutorService vThreadPool; private final boolean parallelQueries; private final boolean shufflePeers; @@ -83,23 +81,6 @@ public static MultiplexingDiscovery forServices(Network network, long services, return new MultiplexingDiscovery(network, discoveries, parallelQueries, shufflePeers); } - /** - * @deprecated Use {@link #forServices(Network, long)} - */ - @Deprecated - public static MultiplexingDiscovery forServices(NetworkParameters params, long services) { - return forServices(params.network(), services); - } - - /** - * @deprecated Use {@link #forServices(Network, long, boolean, boolean)} - */ - @Deprecated - public static MultiplexingDiscovery forServices(NetworkParameters params, long services, boolean parallelQueries, - boolean shufflePeers) { - return forServices(params.network(), services, parallelQueries, shufflePeers); - } - /** * Will query the given seeds in parallel before producing a merged response. * @param network The network we are querying for @@ -109,19 +90,9 @@ public MultiplexingDiscovery(Network network, List seeds) { this(network, seeds, true, true); } - /** - * Will query the given seeds in parallel before producing a merged response. - * @deprecated Use {@link MultiplexingDiscovery#MultiplexingDiscovery(Network, List)} - */ - @Deprecated - public MultiplexingDiscovery(NetworkParameters params, List seeds) { - this(params.network(), seeds); - } - private MultiplexingDiscovery(Network network, List seeds, boolean parallelQueries, boolean shufflePeers) { checkArgument(!seeds.isEmpty() || network == REGTEST); - this.netParams = NetworkParameters.of(network); this.seeds = seeds; this.parallelQueries = parallelQueries; this.shufflePeers = shufflePeers;