determine warning lookbehind in terms of SHARE_PERIOD instead of using a magic number

diff --git a/p2pool/data.py b/p2pool/data.py
index ef349cb..c0c9344 100644 (file)
--- a/p2pool/data.py
+++ b/p2pool/data.py
@@ -503,11 +503,11 @@ def get_desired_version_counts(tracker, best_share_hash, dist):
         res[share.desired_version] = res.get(share.desired_version, 0) + bitcoin_data.target_to_average_attempts(share.target)
     return res
 
-def get_warnings(tracker, current_work):
+def get_warnings(tracker, current_work, net):
     res = []
     
-    height = tracker.get_height(current_work.value['best_share_hash'])
-    desired_version_counts = get_desired_version_counts(tracker, current_work.value['best_share_hash'], min(720, height))
+    desired_version_counts = get_desired_version_counts(tracker, current_work.value['best_share_hash'],
+        min(60*60//net.SHARE_PERIOD, tracker.get_height(current_work.value['best_share_hash'])))
     majority_desired_version = max(desired_version_counts, key=lambda k: desired_version_counts[k])
     if majority_desired_version not in [0, 1] and desired_version_counts[majority_desired_version] > sum(desired_version_counts.itervalues())/2:
         res.append('A MAJORITY OF SHARES CONTAIN A VOTE FOR AN UNSUPPORTED SHARE IMPLEMENTATION! (v%i with %i%% support)\n'

diff --git a/p2pool/main.py b/p2pool/main.py
index b2e673b..a1dc211 100644 (file)
--- a/p2pool/main.py
+++ b/p2pool/main.py
@@ -811,7 +811,7 @@ def main(args, net, datadir_path, merged_urls, worker_endpoint):
                             math.format_dt(2**256 / current_work.value['bits'].target / real_att_s),
                         )
                         
-                        for warning in p2pool_data.get_warnings(tracker, current_work):
+                        for warning in p2pool_data.get_warnings(tracker, current_work, net):
                             print >>sys.stderr, '#'*40
                             print >>sys.stderr, '>>> Warning: ' + warning
                             print >>sys.stderr, '#'*40

diff --git a/p2pool/web.py b/p2pool/web.py
index 2560eeb..7640e99 100644 (file)
--- a/p2pool/web.py
+++ b/p2pool/web.py
@@ -172,7 +172,7 @@ def get_web_root(tracker, current_work, current_work2, get_current_txouts, datad
             ),
             uptime=time.time() - start_time,
             block_value=current_work2.value['subsidy']*1e-8,
-            warnings=p2pool_data.get_warnings(tracker, current_work),
+            warnings=p2pool_data.get_warnings(tracker, current_work, net),
         )
     
     class WebInterface(resource.Resource):