git://git.novaco.in
/
p2pool.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
f384a6f
)
fix baea64dc5 - assert failed in debug mode
author
Forrest Voight
<forrest@forre.st>
Tue, 20 Mar 2012 20:15:40 +0000 (16:15 -0400)
committer
Forrest Voight
<forrest@forre.st>
Tue, 20 Mar 2012 20:16:27 +0000 (16:16 -0400)
p2pool/bitcoin/data.py
patch
|
blob
|
history
diff --git
a/p2pool/bitcoin/data.py
b/p2pool/bitcoin/data.py
index
628be33
..
8ec40de
100644
(file)
--- a/
p2pool/bitcoin/data.py
+++ b/
p2pool/bitcoin/data.py
@@
-193,7
+193,7
@@
def calculate_merkle_link(hashes, index):
assert hash_list[0][1]
if p2pool.DEBUG:
- assert check_merkle_branch(hashes[index], index, res) == hash_list[0][0]
+ assert check_merkle_link(hashes[index], dict(branch=res, index=index)) == hash_list[0][0]
assert index == sum(k*2**i for i, k in enumerate([1-x['side'] for x in hash_list[0][2]]))
return dict(branch=res, index=index)