completed previous incomplete patch of memory leak
authorForrest Voight <forrest@forre.st>
Fri, 25 Jan 2013 20:31:55 +0000 (15:31 -0500)
committerForrest Voight <forrest@forre.st>
Fri, 25 Jan 2013 20:35:45 +0000 (15:35 -0500)
p2pool/data.py
p2pool/p2p.py

index fffa020..a786fe5 100644 (file)
@@ -40,6 +40,7 @@ share_type = pack.ComposedType([
 ])
 
 def load_share(share, net, peer_addr):
+    assert isinstance(peer_addr, tuple)
     if share['type'] in [0, 1, 2, 3, 4, 5, 6, 7, 8]:
         from p2pool import p2p
         raise p2p.PeerMisbehavingError('sent an obsolete share')
index d89cbfa..d833961 100644 (file)
@@ -310,7 +310,7 @@ class Protocol(p2protocol.Protocol):
     ])
     def handle_sharereply(self, id, result, shares):
         if result == 'good':
-            res = [p2pool_data.load_share(share, self.node.net, self) for share in shares if share['type'] >= 9]
+            res = [p2pool_data.load_share(share, self.node.net, self.addr) for share in shares if share['type'] >= 9]
         else:
             res = failure.Failure("sharereply result: " + result)
         self.get_shares.got_response(id, res)