added testcase for node+work that simulates mining 100 shares

[p2pool.git] / p2pool / node.py

diff --git a/p2pool/node.py b/p2pool/node.py
index 2d1d807..4a90646 100644 (file)
--- a/p2pool/node.py
+++ b/p2pool/node.py
@@ -174,7 +174,7 @@ class Node(object):
         self.bitcoind_work = variable.Variable((yield helper.getwork(self.bitcoind)))
         @defer.inlineCallbacks
         def work_poller():
-            while True:
+            while stop_signal.times == 0:
                 flag = self.factory.new_block.get_deferred()
                 try:
                     self.bitcoind_work.set((yield helper.getwork(self.bitcoind, self.bitcoind_work.value['use_getblocktemplate'])))
@@ -204,6 +204,8 @@ class Node(object):
         self.handle_header = handle_header
         @defer.inlineCallbacks
         def poll_header():
+            if self.factory.conn.value is None:
+                return
             handle_header((yield self.factory.conn.value.get_block_header(self.bitcoind_work.value['previous_block'])))
         self.bitcoind_work.changed.watch(lambda _: poll_header())
         yield deferral.retry('Error while requesting best block header:')(poll_header)()
@@ -272,9 +274,13 @@ class Node(object):
                     if tx_hash in self.known_txs_var.value:
                         new_known_txs[tx_hash] = self.known_txs_var.value[tx_hash]
             self.known_txs_var.set(new_known_txs)
-        task.LoopingCall(forget_old_txs).start(10)
+        t = task.LoopingCall(forget_old_txs)
+        t.start(10)
+        stop_signal.watch(t.stop)
         
-        task.LoopingCall(self.clean_tracker).start(5)
+        t = task.LoopingCall(self.clean_tracker)
+        t.start(5)
+        stop_signal.watch(t.stop)
     
     def set_best_share(self):
         best, desired, decorated_heads = self.tracker.think(self.get_height_rel_highest, self.bitcoind_work.value['previous_block'], self.bitcoind_work.value['bits'], self.known_txs_var.value)
@@ -317,11 +323,7 @@ class Node(object):
             for tail, heads in self.tracker.tails.iteritems():
                 if min(self.tracker.get_height(head) for head in heads) < 2*self.tracker.net.CHAIN_LENGTH + 10:
                     continue
-                for aftertail in self.tracker.reverse.get(tail, set()):
-                    if len(self.tracker.reverse[self.tracker.items[aftertail].previous_hash]) > 1: # XXX
-                        print "raw"
-                        continue
-                    to_remove.add(aftertail)
+                to_remove.update(self.tracker.reverse.get(tail, set()))
             if not to_remove:
                 break
             # if removed from this, it must be removed from verified