Merge pull request #104 from juga0/feature/minimal_code

Temporally remove all code that is not used in bwscan cli

Author: juga0

bwscanner/circuit.py

@@ -31,6 +31,7 @@ def random_path_to_exit(exit_relay, relays):
 class CircuitGenerator(object):
     def __init__(self, state):
         self.state = state
+        # FIXME: don't we want to remove the exits from the list of relays?
         self.relays = list(set(r for r in state.routers.values() if r))
         self.exits = [relay for relay in self.relays if is_valid_exit(relay)]
 
@@ -41,32 +42,6 @@ def next(self):
         raise NotImplementedError
 
 
-class ExitScan(CircuitGenerator):
-    """
-    Returns a generator that yields a set of circuits.
-
-    The set of circuits contain each exit relay from a snapshot
-    of the consensus in the exit position once. The first and
-    second hops are selected randomly.
-    """
-    def __init__(self, state):
-        super(ExitScan, self).__init__(state)
-        random.shuffle(self.exits)
-
-        def circuit_generator():
-            """
-            Pick two other relays for a circuit while being sure not
-            to use the exit relay more than once.
-            """
-            for exit_relay in self.exits:
-                yield random_path_to_exit(exit_relay, self.relays)
-
-        self._circgen = circuit_generator()
-
-    def next(self):
-        return self._circgen.next()
-
-
 class TwoHop(CircuitGenerator):
     """
     Select two hop circuits with the relay to be measured and a random exit
@@ -133,23 +108,3 @@ def exit_by_bw(self, relay):
 
     def next(self):
         return self._circgen.next()
-
-
-class ThereAndBackAgain(CircuitGenerator):
-    def __init__(self, state, entry_exit_relay):
-        super(ThereAndBackAgain, self).__init__(state)
-        random.shuffle(self.relays)
-
-        def circuit_generator():
-            """
-            Select a three hop path with the scanned relay as a middle relay.
-            """
-            for relay in self.relays:
-                yield [entry_exit_relay,
-                       relay,
-                       entry_exit_relay]
-
-        self._circgen = circuit_generator()
-
-    def next(self):
-        return self._circgen.next()

bwscanner/fetcher.py

@@ -4,7 +4,6 @@
 from twisted.internet import reactor, defer, protocol
 from twisted.internet.endpoints import TCP4ClientEndpoint
 from twisted.web.client import (ResponseDone, PotentialDataLoss, PartialDownloadError)
-
 from bwscanner.logger import log