X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=p2pool%2Ftest%2Ftest_node.py;h=3f5320088ea365a2795fa46bd656e3e235e3eb01;hb=2cb4d8381e179f71ea2075cdce948ea83cf0dc55;hp=756ff51e2613722eb3f5f0e56ac7ae59cecb27bd;hpb=ef86e467e4a82ec51d4e51230fa505eb9ca53d8e;p=p2pool.git

diff --git a/p2pool/test/test_node.py b/p2pool/test/test_node.py
index 756ff51..3f53200 100644
--- a/p2pool/test/test_node.py
+++ b/p2pool/test/test_node.py
@@ -140,7 +140,7 @@ class MiniNode(object):
         self.n = node.Node(factory, bitcoind, [], [], net)
         yield self.n.start()
         
-        self.n.p2p_node = node.P2PNode(self.n, 0, 1000000, {}, [('127.0.0.1', peer_port) for peer_port in peer_ports])
+        self.n.p2p_node = node.P2PNode(self.n, port=0, max_incoming_conns=1000000, addr_store={}, connect_addrs=[('127.0.0.1', peer_port) for peer_port in peer_ports])
         self.n.p2p_node.start()
         
         wb = work.WorkerBridge(node=self.n, my_pubkey_hash=random.randrange(2**160), donation_percentage=random.uniform(0, 10), merged_urls=merged_urls, worker_fee=3)
@@ -201,10 +201,6 @@ class Test(unittest.TestCase):
     
     @defer.inlineCallbacks
     def test_nodes(self):
-      try:
-        old_successor = data.Share.SUCCESSOR
-        data.Share.SUCCESSOR = data.NewShare
-        
         N = 3
         SHARES = 600
         
@@ -227,7 +223,7 @@ class Test(unittest.TestCase):
         for i, n in enumerate(nodes):
             assert len(n.n.tracker.items) == SHARES, (i, len(n.n.tracker.items))
             assert n.n.tracker.verified.get_height(n.n.best_share_var.value) == SHARES, (i, n.n.tracker.verified.get_height(n.n.best_share_var.value))
-            assert type(n.n.tracker.items[nodes[0].n.best_share_var.value]) is data.NewShare
+            assert type(n.n.tracker.items[nodes[0].n.best_share_var.value]) is data.NewNewShare
             assert type(n.n.tracker.items[n.n.tracker.get_nth_parent_hash(nodes[0].n.best_share_var.value, SHARES - 5)]) is data.Share
         
         for n in nodes:
@@ -240,5 +236,3 @@ class Test(unittest.TestCase):
         gc.collect()
         
         yield deferral.sleep(20) # waiting for work_poller to exit
-      finally:
-        data.Share.SUCCESSOR = old_successor