From 7cd3c2890bb725a84ec6ff65e78d3b82e576735d Mon Sep 17 00:00:00 2001 From: akwizgran Date: Sat, 16 Apr 2022 11:05:26 +0100 Subject: [PATCH] Remove backoff for polling Tor plugin. --- .../bramble/plugin/tor/AndroidTorPlugin.java | 4 +--- .../plugin/tor/AndroidTorPluginFactory.java | 11 ++++------ .../bramble/plugin/tor/TorPlugin.java | 21 +++---------------- .../bramble/plugin/tor/TorPluginFactory.java | 14 ++----------- .../bramble/plugin/tor/JavaTorPlugin.java | 4 +--- .../bramble/plugin/tor/UnixTorPlugin.java | 4 +--- .../plugin/tor/UnixTorPluginFactory.java | 11 ++++------ .../bramble/plugin/tor/WindowsTorPlugin.java | 4 +--- .../plugin/tor/WindowsTorPluginFactory.java | 11 ++++------ .../bramble/plugin/tor/BridgeTest.java | 8 ++----- 10 files changed, 23 insertions(+), 69 deletions(-) diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java index d8933d101..65f2d6e94 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java @@ -9,7 +9,6 @@ import org.briarproject.bramble.api.battery.BatteryManager; import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; -import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.system.AndroidWakeLock; import org.briarproject.bramble.api.system.AndroidWakeLockManager; @@ -64,7 +63,6 @@ class AndroidTorPlugin extends TorPlugin { CircumventionProvider circumventionProvider, BatteryManager batteryManager, AndroidWakeLockManager wakeLockManager, - Backoff backoff, TorRendezvousCrypto torRendezvousCrypto, PluginCallback callback, String architecture, @@ -75,7 +73,7 @@ class AndroidTorPlugin extends TorPlugin { int torControlPort) { super(ioExecutor, wakefulIoExecutor, networkManager, locationUtils, torSocketFactory, clock, resourceProvider, - circumventionProvider, batteryManager, backoff, + circumventionProvider, batteryManager, torRendezvousCrypto, callback, architecture, maxLatency, maxIdleTime, torDirectory, torSocksPort, torControlPort); this.app = app; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java index ce0e2675b..d0f8a44f2 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java @@ -8,8 +8,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.Backoff; -import org.briarproject.bramble.api.plugin.BackoffFactory; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.TorControlPort; import org.briarproject.bramble.api.plugin.TorDirectory; @@ -44,7 +42,6 @@ public class AndroidTorPluginFactory extends TorPluginFactory { LocationUtils locationUtils, EventBus eventBus, SocketFactory torSocketFactory, - BackoffFactory backoffFactory, ResourceProvider resourceProvider, CircumventionProvider circumventionProvider, BatteryManager batteryManager, @@ -56,7 +53,7 @@ public class AndroidTorPluginFactory extends TorPluginFactory { Application app, AndroidWakeLockManager wakeLockManager) { super(ioExecutor, wakefulIoExecutor, networkManager, locationUtils, - eventBus, torSocketFactory, backoffFactory, resourceProvider, + eventBus, torSocketFactory, resourceProvider, circumventionProvider, batteryManager, clock, crypto, torDirectory, torSocksPort, torControlPort); this.app = app; @@ -76,14 +73,14 @@ public class AndroidTorPluginFactory extends TorPluginFactory { } @Override - TorPlugin createPluginInstance(Backoff backoff, - TorRendezvousCrypto torRendezvousCrypto, PluginCallback callback, + TorPlugin createPluginInstance(TorRendezvousCrypto torRendezvousCrypto, + PluginCallback callback, String architecture) { return new AndroidTorPlugin(ioExecutor, wakefulIoExecutor, app, networkManager, locationUtils, torSocketFactory, clock, resourceProvider, circumventionProvider, batteryManager, wakeLockManager, - backoff, torRendezvousCrypto, callback, architecture, + torRendezvousCrypto, callback, architecture, MAX_LATENCY, MAX_IDLE_TIME, torDirectory, torSocksPort, torControlPort); } diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java index 164c22c46..a4f6e566d 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java @@ -18,7 +18,6 @@ import org.briarproject.bramble.api.network.event.NetworkStatusEvent; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; -import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.ConnectionHandler; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.PluginException; @@ -132,7 +131,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { private final SocketFactory torSocketFactory; private final Clock clock; private final BatteryManager batteryManager; - private final Backoff backoff; private final TorRendezvousCrypto torRendezvousCrypto; private final PluginCallback callback; private final String architecture; @@ -166,7 +164,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { ResourceProvider resourceProvider, CircumventionProvider circumventionProvider, BatteryManager batteryManager, - Backoff backoff, TorRendezvousCrypto torRendezvousCrypto, PluginCallback callback, String architecture, @@ -184,7 +181,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { this.resourceProvider = resourceProvider; this.circumventionProvider = circumventionProvider; this.batteryManager = batteryManager; - this.backoff = backoff; this.torRendezvousCrypto = torRendezvousCrypto; this.callback = callback; this.architecture = architecture; @@ -474,7 +470,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { callback.mergeSettings(s); // Create a hidden service if necessary ioExecutor.execute(() -> publishHiddenService(localPort)); - backoff.reset(); // Accept incoming hidden service connections from Tor acceptContactConnections(ss); }); @@ -541,7 +536,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { return; } LOG.info("Connection received"); - backoff.reset(); callback.handleConnection(new TorTransportConnection(this, s)); } } @@ -618,14 +612,13 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { @Override public int getPollingInterval() { - return backoff.getPollingInterval(); + return 120_000; // FIXME } @Override public void poll(Collection> properties) { if (getState() != ACTIVE) return; - backoff.increment(); for (Pair p : properties) { connect(p.getFirst(), p.getSecond()); } @@ -634,10 +627,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { private void connect(TransportProperties p, ConnectionHandler h) { wakefulIoExecutor.execute(() -> { DuplexTransportConnection d = createConnection(p); - if (d != null) { - backoff.reset(); - h.handleConnection(d); - } + if (d != null) h.handleConnection(d); }); } @@ -760,7 +750,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { // DisableNetwork, set our circuitBuilt flag if not already set if (status.equals("BUILT") && !state.getAndSetCircuitBuilt(true)) { LOG.info("Circuit built"); - backoff.reset(); } } @@ -813,12 +802,8 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { if (msg.startsWith("BOOTSTRAP PROGRESS=100")) { LOG.info("Bootstrapped"); state.setBootstrapped(); - backoff.reset(); } else if (msg.startsWith("CIRCUIT_ESTABLISHED")) { - if (!state.getAndSetCircuitBuilt(true)) { - LOG.info("Circuit built"); - backoff.reset(); - } + if (!state.getAndSetCircuitBuilt(true)) LOG.info("Circuit built"); } else if (msg.startsWith("CIRCUIT_NOT_ESTABLISHED")) { if (state.getAndSetCircuitBuilt(false)) { LOG.info("Circuit not built"); diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPluginFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPluginFactory.java index a22165151..62fb1ad04 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPluginFactory.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPluginFactory.java @@ -6,8 +6,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.Backoff; -import org.briarproject.bramble.api.plugin.BackoffFactory; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.TorConstants; import org.briarproject.bramble.api.plugin.TorControlPort; @@ -41,16 +39,12 @@ abstract class TorPluginFactory implements DuplexPluginFactory { protected static final int MAX_LATENCY = 30 * 1000; // 30 seconds protected static final int MAX_IDLE_TIME = 30 * 1000; // 30 seconds - private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute - private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins - private static final double BACKOFF_BASE = 1.2; protected final Executor ioExecutor, wakefulIoExecutor; protected final NetworkManager networkManager; protected final LocationUtils locationUtils; protected final EventBus eventBus; protected final SocketFactory torSocketFactory; - protected final BackoffFactory backoffFactory; protected final ResourceProvider resourceProvider; protected final CircumventionProvider circumventionProvider; protected final BatteryManager batteryManager; @@ -66,7 +60,6 @@ abstract class TorPluginFactory implements DuplexPluginFactory { LocationUtils locationUtils, EventBus eventBus, SocketFactory torSocketFactory, - BackoffFactory backoffFactory, ResourceProvider resourceProvider, CircumventionProvider circumventionProvider, BatteryManager batteryManager, @@ -81,7 +74,6 @@ abstract class TorPluginFactory implements DuplexPluginFactory { this.locationUtils = locationUtils; this.eventBus = eventBus; this.torSocketFactory = torSocketFactory; - this.backoffFactory = backoffFactory; this.resourceProvider = resourceProvider; this.circumventionProvider = circumventionProvider; this.batteryManager = batteryManager; @@ -95,7 +87,7 @@ abstract class TorPluginFactory implements DuplexPluginFactory { @Nullable abstract String getArchitectureForTorBinary(); - abstract TorPlugin createPluginInstance(Backoff backoff, + abstract TorPlugin createPluginInstance( TorRendezvousCrypto torRendezvousCrypto, PluginCallback callback, String architecture); @@ -122,11 +114,9 @@ abstract class TorPluginFactory implements DuplexPluginFactory { LOG.info("The selected architecture for Tor is " + architecture); } - Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL, - MAX_POLLING_INTERVAL, BACKOFF_BASE); TorRendezvousCrypto torRendezvousCrypto = new TorRendezvousCryptoImpl(crypto); - TorPlugin plugin = createPluginInstance(backoff, torRendezvousCrypto, + TorPlugin plugin = createPluginInstance(torRendezvousCrypto, callback, architecture); eventBus.addListener(plugin); return plugin; diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/JavaTorPlugin.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/JavaTorPlugin.java index dcc0c9f00..4b30c0322 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/JavaTorPlugin.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/JavaTorPlugin.java @@ -3,7 +3,6 @@ package org.briarproject.bramble.plugin.tor; import org.briarproject.bramble.api.battery.BatteryManager; import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; @@ -29,7 +28,6 @@ abstract class JavaTorPlugin extends TorPlugin { ResourceProvider resourceProvider, CircumventionProvider circumventionProvider, BatteryManager batteryManager, - Backoff backoff, TorRendezvousCrypto torRendezvousCrypto, PluginCallback callback, String architecture, @@ -40,7 +38,7 @@ abstract class JavaTorPlugin extends TorPlugin { int torControlPort) { super(ioExecutor, wakefulIoExecutor, networkManager, locationUtils, torSocketFactory, clock, resourceProvider, - circumventionProvider, batteryManager, backoff, + circumventionProvider, batteryManager, torRendezvousCrypto, callback, architecture, maxLatency, maxIdleTime, torDirectory, torSocksPort, torControlPort); diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPlugin.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPlugin.java index c68dc0130..981df38c4 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPlugin.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPlugin.java @@ -6,7 +6,6 @@ import com.sun.jna.Native; import org.briarproject.bramble.api.battery.BatteryManager; import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; @@ -29,7 +28,6 @@ class UnixTorPlugin extends JavaTorPlugin { ResourceProvider resourceProvider, CircumventionProvider circumventionProvider, BatteryManager batteryManager, - Backoff backoff, TorRendezvousCrypto torRendezvousCrypto, PluginCallback callback, String architecture, @@ -40,7 +38,7 @@ class UnixTorPlugin extends JavaTorPlugin { int torControlPort) { super(ioExecutor, wakefulIoExecutor, networkManager, locationUtils, torSocketFactory, clock, resourceProvider, - circumventionProvider, batteryManager, backoff, + circumventionProvider, batteryManager, torRendezvousCrypto, callback, architecture, maxLatency, maxIdleTime, torDirectory, torSocksPort, torControlPort); diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java index c31bd8e57..99037f9bb 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java @@ -6,8 +6,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.Backoff; -import org.briarproject.bramble.api.plugin.BackoffFactory; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.TorControlPort; import org.briarproject.bramble.api.plugin.TorDirectory; @@ -39,7 +37,6 @@ public class UnixTorPluginFactory extends TorPluginFactory { LocationUtils locationUtils, EventBus eventBus, SocketFactory torSocketFactory, - BackoffFactory backoffFactory, ResourceProvider resourceProvider, CircumventionProvider circumventionProvider, BatteryManager batteryManager, @@ -49,7 +46,7 @@ public class UnixTorPluginFactory extends TorPluginFactory { @TorSocksPort int torSocksPort, @TorControlPort int torControlPort) { super(ioExecutor, wakefulIoExecutor, networkManager, locationUtils, - eventBus, torSocketFactory, backoffFactory, resourceProvider, + eventBus, torSocketFactory, resourceProvider, circumventionProvider, batteryManager, clock, crypto, torDirectory, torSocksPort, torControlPort); } @@ -69,13 +66,13 @@ public class UnixTorPluginFactory extends TorPluginFactory { } @Override - TorPlugin createPluginInstance(Backoff backoff, - TorRendezvousCrypto torRendezvousCrypto, PluginCallback callback, + TorPlugin createPluginInstance(TorRendezvousCrypto torRendezvousCrypto, + PluginCallback callback, String architecture) { return new UnixTorPlugin(ioExecutor, wakefulIoExecutor, networkManager, locationUtils, torSocketFactory, clock, resourceProvider, circumventionProvider, batteryManager, - backoff, torRendezvousCrypto, callback, architecture, + torRendezvousCrypto, callback, architecture, MAX_LATENCY, MAX_IDLE_TIME, torDirectory, torSocksPort, torControlPort); } diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPlugin.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPlugin.java index 9f49416fe..c1aadce50 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPlugin.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPlugin.java @@ -5,7 +5,6 @@ import com.sun.jna.platform.win32.Kernel32; import org.briarproject.bramble.api.battery.BatteryManager; import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.Backoff; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.PluginException; import org.briarproject.bramble.api.system.Clock; @@ -34,7 +33,6 @@ class WindowsTorPlugin extends JavaTorPlugin { ResourceProvider resourceProvider, CircumventionProvider circumventionProvider, BatteryManager batteryManager, - Backoff backoff, TorRendezvousCrypto torRendezvousCrypto, PluginCallback callback, String architecture, @@ -45,7 +43,7 @@ class WindowsTorPlugin extends JavaTorPlugin { int torControlPort) { super(ioExecutor, wakefulIoExecutor, networkManager, locationUtils, torSocketFactory, clock, resourceProvider, - circumventionProvider, batteryManager, backoff, + circumventionProvider, batteryManager, torRendezvousCrypto, callback, architecture, maxLatency, maxIdleTime, torDirectory, torSocksPort, torControlPort); diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPluginFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPluginFactory.java index 9496a9689..c24ef79fc 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPluginFactory.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/WindowsTorPluginFactory.java @@ -6,8 +6,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.Backoff; -import org.briarproject.bramble.api.plugin.BackoffFactory; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.TorControlPort; import org.briarproject.bramble.api.plugin.TorDirectory; @@ -39,7 +37,6 @@ public class WindowsTorPluginFactory extends TorPluginFactory { LocationUtils locationUtils, EventBus eventBus, SocketFactory torSocketFactory, - BackoffFactory backoffFactory, ResourceProvider resourceProvider, CircumventionProvider circumventionProvider, BatteryManager batteryManager, @@ -49,7 +46,7 @@ public class WindowsTorPluginFactory extends TorPluginFactory { @TorSocksPort int torSocksPort, @TorControlPort int torControlPort) { super(ioExecutor, wakefulIoExecutor, networkManager, locationUtils, - eventBus, torSocketFactory, backoffFactory, resourceProvider, + eventBus, torSocketFactory, resourceProvider, circumventionProvider, batteryManager, clock, crypto, torDirectory, torSocksPort, torControlPort); } @@ -67,13 +64,13 @@ public class WindowsTorPluginFactory extends TorPluginFactory { } @Override - TorPlugin createPluginInstance(Backoff backoff, - TorRendezvousCrypto torRendezvousCrypto, PluginCallback callback, + TorPlugin createPluginInstance(TorRendezvousCrypto torRendezvousCrypto, + PluginCallback callback, String architecture) { return new WindowsTorPlugin(ioExecutor, wakefulIoExecutor, networkManager, locationUtils, torSocketFactory, clock, resourceProvider, circumventionProvider, batteryManager, - backoff, torRendezvousCrypto, callback, architecture, + torRendezvousCrypto, callback, architecture, MAX_LATENCY, MAX_IDLE_TIME, torDirectory, torSocksPort, torControlPort); } diff --git a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java index 4e4b0524f..7e94e5acb 100644 --- a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java +++ b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java @@ -8,7 +8,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.BackoffFactory; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; @@ -110,8 +109,6 @@ public class BridgeTest extends BrambleTestCase { @Inject EventBus eventBus; @Inject - BackoffFactory backoffFactory; - @Inject Clock clock; @Inject CryptoComponent crypto; @@ -166,9 +163,8 @@ public class BridgeTest extends BrambleTestCase { }; factory = new UnixTorPluginFactory(ioExecutor, wakefulIoExecutor, networkManager, locationUtils, eventBus, torSocketFactory, - backoffFactory, resourceProvider, bridgeProvider, - batteryManager, clock, crypto, torDir, - SOCKS_PORT, CONTROL_PORT); + resourceProvider, bridgeProvider, batteryManager, clock, + crypto, torDir, SOCKS_PORT, CONTROL_PORT); } @After