From 3a89fe76ff87380ea36b091947cb354027d223f4 Mon Sep 17 00:00:00 2001 From: Forrest Voight Date: Fri, 28 Dec 2012 01:22:24 -0500 Subject: [PATCH] removed now-unnecessary "transactions" argment to get_share --- p2pool/data.py | 2 +- p2pool/work.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/p2pool/data.py b/p2pool/data.py index 05f35fa..cb5f4b9 100644 --- a/p2pool/data.py +++ b/p2pool/data.py @@ -198,7 +198,7 @@ class Share(object): lock_time=0, ) - def get_share(header, transactions): + def get_share(header): min_header=dict(header);del min_header['merkle_root'] return cls(net, None, dict( min_header=min_header, diff --git a/p2pool/work.py b/p2pool/work.py index bc836ed..a26f183 100644 --- a/p2pool/work.py +++ b/p2pool/work.py @@ -324,7 +324,7 @@ class WorkerBridge(worker_interface.WorkerBridge): log.err(None, 'Error while processing merged mining POW:') if pow_hash <= share_info['bits'].target and header_hash not in received_header_hashes: - share = get_share(header, transactions) + share = get_share(header) print 'GOT SHARE! %s %s prev %s age %.2fs%s' % ( request.getUser(), -- 1.7.1