added some missing imports. them missing shouldn't have any consequences beyond stack...

[p2pool.git] / p2pool / p2p.py

diff --git a/p2pool/p2p.py b/p2pool/p2p.py
index 083ad13..7d3c860 100644 (file)
--- a/p2pool/p2p.py
+++ b/p2pool/p2p.py
@@ -2,6 +2,7 @@ from __future__ import division
 
 import math
 import random
+import sys
 import time
 
 from twisted.internet import defer, protocol, reactor
@@ -20,8 +21,8 @@ def fragment(f, **kwargs):
     try:
         return f(**kwargs)
     except p2protocol.TooLong:
-        att(f, **dict((k, v[:len(v)//2]) for k, v in kwargs.iteritems()))
-        return att(f, **dict((k, v[len(v)//2:]) for k, v in kwargs.iteritems()))
+        fragment(f, **dict((k, v[:len(v)//2]) for k, v in kwargs.iteritems()))
+        return fragment(f, **dict((k, v[len(v)//2:]) for k, v in kwargs.iteritems()))
 
 class Protocol(p2protocol.Protocol):
     max_remembered_txs_size = 2500000
@@ -185,7 +186,7 @@ class Protocol(p2protocol.Protocol):
                 assert self.remote_remembered_txs_size <= self.max_remembered_txs_size
                 fragment(self.send_remember_tx, tx_hashes=[x for x in added if x in self.remote_tx_hashes], txs=[after[x] for x in added if x not in self.remote_tx_hashes])
             if removed:
-                self.send_forget_tx(tx_hashes=removed)
+                self.send_forget_tx(tx_hashes=list(removed))
                 self.remote_remembered_txs_size -= sum(len(bitcoin_data.tx_type.pack(before[x])) for x in removed)
         watch_id2 = self.node.mining_txs_var.transitioned.watch(update_remote_view_of_my_mining_txs)
         self.connection_lost_event.watch(lambda: self.node.mining_txs_var.transitioned.unwatch(watch_id2))