From: Forrest Voight <forrest.voight@gmail.com>
Date: Sun, 8 Apr 2012 20:20:59 +0000 (-0400)
Subject: completely removed vip password, left over from old graphs
X-Git-Tag: 0.10.4~14
X-Git-Url: https://git.novaco.in/?p=p2pool.git;a=commitdiff_plain;h=237c97180e5500a941517e3fac02c3255a153689

completely removed vip password, left over from old graphs
---

diff --git a/p2pool/main.py b/p2pool/main.py
index 04214d9..95b6d99 100644
--- a/p2pool/main.py
+++ b/p2pool/main.py
@@ -400,14 +400,6 @@ def main(args, net, datadir_path, merged_urls, worker_endpoint):
         
         print 'Listening for workers on %r port %i...' % (worker_endpoint[0], worker_endpoint[1])
         
-        if os.path.exists(os.path.join(datadir_path, 'vip_pass')):
-            with open(os.path.join(datadir_path, 'vip_pass'), 'rb') as f:
-                vip_pass = f.read().strip('\r\n')
-        else:
-            vip_pass = '%016x' % (random.randrange(2**64),)
-            with open(os.path.join(datadir_path, 'vip_pass'), 'wb') as f:
-                f.write(vip_pass)
-        
         # setup worker logic
         
         removed_unstales_var = variable.Variable((0, 0, 0))
@@ -648,7 +640,7 @@ def main(args, net, datadir_path, merged_urls, worker_endpoint):
                     else:
                         received_header_hashes.add(header_hash)
                         
-                        pseudoshare_received.happened(bitcoin_data.target_to_average_attempts(target), not on_time, request.getUser(), request.getPassword() == vip_pass)
+                        pseudoshare_received.happened(bitcoin_data.target_to_average_attempts(target), not on_time, request.getUser())
                         self.recent_shares_ts_work.append((time.time(), bitcoin_data.target_to_average_attempts(target)))
                         while len(self.recent_shares_ts_work) > 50:
                             self.recent_shares_ts_work.pop(0)
diff --git a/p2pool/web.py b/p2pool/web.py
index c44a803..df393e8 100644
--- a/p2pool/web.py
+++ b/p2pool/web.py
@@ -329,7 +329,7 @@ def get_web_root(tracker, current_work, current_work2, get_current_txouts, datad
     }, hd_obj)
     task.LoopingCall(lambda: _atomic_write(hd_path, json.dumps(hd.to_obj()))).start(100)
     @pseudoshare_received.watch
-    def _(work, dead, user, had_vip_pass):
+    def _(work, dead, user):
         t = time.time()
         hd.datastreams['local_hash_rate'].add_datum(t, work)
         if dead: