From 3ca723ee19cb8e2ee54e32a81e0d3caa2ff51441 Mon Sep 17 00:00:00 2001 From: Forrest Voight Date: Sun, 18 Aug 2013 01:49:42 -0400 Subject: [PATCH] fixed sharereply result handler raising a string as an exception --- p2pool/p2p.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/p2pool/p2p.py b/p2pool/p2p.py index cd85a2ee9..6383ef910 100644 --- a/p2pool/p2p.py +++ b/p2pool/p2p.py @@ -330,11 +330,12 @@ def handle_sharereq(self, id, hashes, parents, stops): ('result', pack.EnumType(pack.VarIntType(), {0: 'good', 1: 'too long', 2: 'unk2', 3: 'unk3', 4: 'unk4', 5: 'unk5', 6: 'unk6'})), ('shares', pack.ListType(p2pool_data.share_type)), ]) + class ShareReplyError(Exception): pass def handle_sharereply(self, id, result, shares): if result == 'good': 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) + res = failure.Failure(self.ShareReplyError(result)) self.get_shares.got_response(id, res)