some tracker cleanup

diff --git a/p2pool/data.py b/p2pool/data.py
index 3409849..6b43a07 100644 (file)
--- a/p2pool/data.py
+++ b/p2pool/data.py
@@ -473,7 +473,7 @@ class OkayTracker(forest.Tracker):
         block_height = max(block_rel_height_func(share.header['previous_block']) for share in
             self.verified.get_chain(end_point, self.net.CHAIN_LENGTH//16))
         
-        return self.net.CHAIN_LENGTH, (self.verified.get_work(share_hash) - self.verified.get_work(end_point))//((0 - block_height + 1)*self.net.PARENT.BLOCK_PERIOD)
+        return self.net.CHAIN_LENGTH, self.verified.get_delta(share_hash, end_point).work//((0 - block_height + 1)*self.net.PARENT.BLOCK_PERIOD)
 
 def get_pool_attempts_per_second(tracker, previous_share_hash, dist, min_work=False, integer=False):
     assert dist >= 2

diff --git a/p2pool/util/forest.py b/p2pool/util/forest.py
index 1b6023c..53548e6 100644 (file)
--- a/p2pool/util/forest.py
+++ b/p2pool/util/forest.py
@@ -229,10 +229,6 @@ class Tracker(object):
         delta = self.get_delta_to_last(share_hash)
         return delta.height, delta.tail
     
-    def get_height_work_and_last(self, share_hash):
-        delta = self.get_delta_to_last(share_hash)
-        return delta.height, delta.work, delta.tail
-    
     def _get_delta(self, share_hash):
         if share_hash in self.deltas:
             delta1, ref = self.deltas[share_hash]