From: Forrest Voight <forrest@forre.st>
Date: Tue, 20 Mar 2012 20:15:40 +0000 (-0400)
Subject: fix baea64dc5 - assert failed in debug mode
X-Git-Tag: 0.10.0~3
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=d38ea1a8c950239f1d5aab8959a90c43df2eac1c;p=p2pool.git

fix baea64dc5 - assert failed in debug mode
---

diff --git a/p2pool/bitcoin/data.py b/p2pool/bitcoin/data.py
index 628be33..8ec40de 100644
--- 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)