Move files into lib/

resultdump.py → lib/resultdump.py

@@ -89,14 +89,13 @@ class ResultDump:
             except Empty:
                 continue
             result = event
-            fp = result.fingerprint
-            nick = result.nickname
             if result is None:
-                print(nick, 'failed')
                 continue
             elif not isinstance(result, Result):
-                print(nick, 'failure', result, type(result))
+                print('failure', result, type(result))
                 continue
+            fp = result.fingerprint
+            nick = result.nickname
             self.write_result(result)
             amount = result.amount
             duration = result.duration

scanner.py

@@ -8,10 +8,10 @@ from threading import Event
 from threading import RLock
 from multiprocessing.dummy import Pool
 import util.stem as stem_utils
-from circuitbuilder import GapsCircuitBuilder as CB
-from relaylist import RelayList
-from resultdump import ResultDump
-from resultdump import Result
+from lib.circuitbuilder import GapsCircuitBuilder as CB
+from lib.resultdump import ResultDump
+from lib.resultdump import Result
+from lib.relaylist import RelayList
 
 end_event = Event()
 stream_building_lock = RLock()