[tor-commits] [arm/master] Dropping unused getAllRelayAddresses() method

atagar at torproject.org atagar at torproject.org
Sun Jun 2 03:14:48 UTC 2013


commit 074f3b13a71eb7dae19246a7086768f0649d2745
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Jun 1 19:53:21 2013 -0700

    Dropping unused getAllRelayAddresses() method
    
    Another arm Controller method we aren't using.
---
 src/util/torTools.py |   30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/src/util/torTools.py b/src/util/torTools.py
index 0cfa13c..e2206d8 100644
--- a/src/util/torTools.py
+++ b/src/util/torTools.py
@@ -832,36 +832,6 @@ class Controller:
     
     return result
   
-  def getAllRelayAddresses(self, default = {}):
-    """
-    Provides a mapping of...
-    Relay IP Address -> [(ORPort, Fingerprint)...]
-    
-    for all relays currently in the cached consensus.
-    
-    Arguments:
-      default - value returned if the query fails
-    """
-    
-    self.connLock.acquire()
-    
-    result = default
-    
-    if self.isAlive():
-      # check both if the cached mappings are unset or blank
-      if not self._fingerprintMappings:
-        self._fingerprintMappings = self._getFingerprintMappings()
-      
-      # Make a shallow copy of the results. This doesn't protect the internal
-      # listings, but good enough for the moment.
-      # TODO: change the [(port, fingerprint)...] lists to tuples?
-      if self._fingerprintMappings != {}:
-        result = dict(self._fingerprintMappings)
-    
-    self.connLock.release()
-    
-    return result
-  
   def getNicknameFingerprint(self, relayNickname):
     """
     Provides the fingerprint associated with the given relay. This provides





More information about the tor-commits mailing list